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

3 files changed, 9 insertions, 12 deletions

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,4 +51,6 @@ bool QtopiaConverter::init()
   catDB = new Categories();
-  if (catDB) 
-  {
+  
+  if (!catDB) 
+    return false;
+    
     catDB->load( categoryFileName() );
@@ -56,7 +58,2 @@ bool QtopiaConverter::init()
   }
-  else 
-  {
-    return false;
-  }
-}
 
@@ -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);
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();