added changes to support qtopia import/export and improved resource support

5 files changed, 22 insertions, 15 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index 3160017..143e965 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -5,7 +5,7 @@ SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
    libkcal libkdepim kabc kabc/converter/opie kabc/converter/qtopia kabc/formats/binary \
    kabc/plugins/file kabc/plugins/dir \
    kabc/plugins/ldap kabc/plugins/opie kabc/plugins/qtopia \
-	 korganizer kalarmd kaddressbook/xxport/opie kaddressbook
+	 korganizer kalarmd kaddressbook/xxport/opie kaddressbook/xxport/qtopia kaddressbook
 all: tmake
 	for i in $(SUBDIRS); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
@@ -50,6 +50,7 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kaddressbook/xxport/opie/Makefile$(PLATFORM) \
+       kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM)
 
 
@@ -109,6 +110,9 @@ kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
 kaddressbook/xxport/opie/Makefile$(PLATFORM): kaddressbook/xxport/opie/opieE.pro
 	cd kaddressbook/xxport/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" opieE.pro -o Makefile$(PLATFORM)
         
+kaddressbook/xxport/qtopia/Makefile$(PLATFORM): kaddressbook/xxport/qtopia/qtopiaE.pro
+	cd kaddressbook/xxport/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" qtopiaE.pro -o Makefile$(PLATFORM)
+          
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
 	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" kaddressbookE.pro -o Makefile$(PLATFORM)
 
diff --git a/kabc/converter/opie/opieconverter.h b/kabc/converter/opie/opieconverter.h
index c7e691f..d251a24 100644
--- a/kabc/converter/opie/opieconverter.h
+++ b/kabc/converter/opie/opieconverter.h
@@ -51,8 +51,8 @@ public:
    */
   virtual ~OpieConverter();
   
-  virtual bool init();
-  virtual void deinit();
+  bool init();
+  void deinit();
   
   /**
    * Converts a vcard string to an addressee.
diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/converter/qtopia/qtopiaconverter.cpp
index e3dd3e6..f451b8b 100644
--- a/kabc/converter/qtopia/qtopiaconverter.cpp
+++ b/kabc/converter/qtopia/qtopiaconverter.cpp
@@ -49,16 +49,13 @@ QtopiaConverter::~QtopiaConverter()
 bool QtopiaConverter::init()
 {
   catDB = new Categories();
-  if (catDB) 
-  {
+  
+  if (!catDB) 
+    return false;
+    
     catDB->load( categoryFileName() );
     return true;
   }
-  else 
-  {
-    return false;
-  }
-}
 
 void QtopiaConverter::deinit()
 {
@@ -209,7 +206,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
     if (contact.anniversary().isValid()) {
       QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate);
 //US      
-      qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1());
+      qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1());
       addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
     }
     
diff --git a/kabc/converter/qtopia/qtopiaconverter.h b/kabc/converter/qtopia/qtopiaconverter.h
index 7397113..8f4c698 100644
--- a/kabc/converter/qtopia/qtopiaconverter.h
+++ b/kabc/converter/qtopia/qtopiaconverter.h
@@ -50,8 +50,8 @@ public:
    */
   virtual ~QtopiaConverter();
   
-  virtual bool init();
-  virtual void deinit();
+  bool init();
+  void deinit();
   
   /**
    * Converts a vcard string to an addressee.
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 248fcab..4798ffe 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -196,13 +196,20 @@ void XXPortManager::loadPlugins()
   factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_kde2_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_kaddrbk_vcard_xxport()));
 
-  //now add the opie import library dynamically
+  //add the opie import library dynamically
   KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" );
   if ( factory ) {
     XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
     factorylist.append(xxportFactory);
   }
 
+  //add the qtopia import library dynamically
+  factory = KLibLoader::self()->factory( "microkaddrbk_qtopia_xxport" );
+  if ( factory ) {
+    XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
+    factorylist.append(xxportFactory);
+  }
+  
   QListIterator<XXPortFactory> it(factorylist);  
   for ( ; it.current(); ++it )
   {
@@ -219,7 +226,6 @@ void XXPortManager::loadPlugins()
                this, SLOT( slotImport( const QString&, const QString& ) ) );
     }
   }
-  
 }