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

3 files changed, 12 insertions, 15 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
@@ -52,6 +52,6 @@ public:
   virtual ~OpieConverter();
   
-  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
@@ -50,13 +50,10 @@ bool QtopiaConverter::init()
 {
   catDB = new Categories();
-  if (catDB) 
-  {
-    catDB->load( categoryFileName() );
-    return true;
-  }
-  else 
-  {
+  
+  if (!catDB) 
     return false;
-  }
+    
+  catDB->load( categoryFileName() );
+  return true;
 }
 
@@ -210,5 +207,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       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);
     }
@@ -231,5 +228,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
-
+    
     QArray<int> catArray = contact.categories();
     QString cat;
@@ -240,5 +237,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
         addr.insertCategory( cat );
     }
-
+    
     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
@@ -51,6 +51,6 @@ public:
   virtual ~QtopiaConverter();
   
-  virtual bool init();
-  virtual void deinit();
+  bool init();
+  void deinit();
   
   /**