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
@@ -48,14 +48,14 @@ public:
 
   /**
    * Destructor.
    */
   virtual ~OpieConverter();
   
-  virtual bool init();
-  virtual void deinit();
+  bool init();
+  void deinit();
   
   /**
    * Converts a vcard string to an addressee.
    *
    * @param contact The opie contact.
    * @param addr    The 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
@@ -46,21 +46,18 @@ QtopiaConverter::~QtopiaConverter()
   deinit();
 }
 
 bool QtopiaConverter::init()
 {
   catDB = new Categories();
-  if (catDB) 
-  {
-    catDB->load( categoryFileName() );
-    return true;
-  }
-  else 
-  {
+  
+  if (!catDB) 
     return false;
-  }
+    
+  catDB->load( categoryFileName() );
+  return true;
 }
 
 void QtopiaConverter::deinit()
 {
   if (catDB) 
   {
@@ -206,13 +203,13 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
     else if (contact.gender() == PimContact::Female)
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female");
         
     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);
     }
     
     addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() );
     if (contact.birthday().isValid())
       addr.setBirthday( contact.birthday() );
@@ -227,22 +224,22 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
     addr.setNote( contact.notes() );
 
     
         
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
-
+    
     QArray<int> catArray = contact.categories();
     QString cat;
 
     for ( unsigned int i=0; i < catArray.size(); i++ ) {
       cat = catDB->label("contact", catArray[i]);
       if ( !cat.isEmpty() )
         addr.insertCategory( cat );
     }
-
+    
     return true;
 }
 
 bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &contact )
 {
     // name
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
@@ -47,14 +47,14 @@ public:
 
   /**
    * Destructor.
    */
   virtual ~QtopiaConverter();
   
-  virtual bool init();
-  virtual void deinit();
+  bool init();
+  void deinit();
   
   /**
    * Converts a vcard string to an addressee.
    *
    * @param contact The qtopia contact.
    * @param addr    The addressee.