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

5 files changed, 26 insertions, 19 deletions

diff --git a/Makefile.Embedded b/Makefile.Embedded
index 3160017..143e965 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -7,3 +7,3 @@ SUBDIRS = libical/src/libical libical/src/libicalss qtcompat microkde \
    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
@@ -52,2 +52,3 @@ tmake: objects qtcompat/Makefile$(PLATFORM) microkde/Makefile$(PLATFORM) \
        kaddressbook/xxport/opie/Makefile$(PLATFORM) \
+       kaddressbook/xxport/qtopia/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM)
@@ -110,3 +111,6 @@ 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
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
@@ -53,4 +53,4 @@ public:
   
-  virtual bool init();
-  virtual void deinit();
+  bool init();
+  void deinit();
   
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
@@ -51,11 +51,8 @@ bool QtopiaConverter::init()
   catDB = new Categories();
-  if (catDB) 
-  {
-    catDB->load( categoryFileName() );
-    return true;
-  }
-  else 
-  {
+  
+  if (!catDB) 
     return false;
-  }
+    
+  catDB->load( categoryFileName() );
+  return true;
 }
@@ -211,3 +208,3 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
 //US      
-      qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1());
+      qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1());
       addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
@@ -232,3 +229,3 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
 //US    QStringList groupList() const;
-
+    
     QArray<int> catArray = contact.categories();
@@ -241,3 +238,3 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
     }
-
+    
     return true;
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
@@ -52,4 +52,4 @@ public:
   
-  virtual bool init();
-  virtual void deinit();
+  bool init();
+  void deinit();
   
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 248fcab..4798ffe 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -198,3 +198,3 @@ void XXPortManager::loadPlugins()
 
-  //now add the opie import library dynamically
+  //add the opie import library dynamically
   KLibFactory *factory = KLibLoader::self()->factory( "microkaddrbk_opie_xxport" );
@@ -205,2 +205,9 @@ void XXPortManager::loadPlugins()
 
+  //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);  
@@ -221,3 +228,2 @@ void XXPortManager::loadPlugins()
   }
-  
 }