-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.cpp | 19 | ||||
-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.h | 4 |
2 files changed, 10 insertions, 13 deletions
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(); |