-rw-r--r-- | kabc/converter/opie/opieconverter.h | 4 | ||||
-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.cpp | 13 | ||||
-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.h | 4 |
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 @@ -51,8 +51,8 @@ public: */ virtual ~OpieConverter(); - virtual bool init(); - virtual void deinit(); + bool init(); + void deinit(); /** * Converts a vcard string to an 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 @@ -49,16 +49,13 @@ QtopiaConverter::~QtopiaConverter() bool QtopiaConverter::init() { catDB = new Categories(); - if (catDB) - { + + if (!catDB) + return false; + catDB->load( categoryFileName() ); return true; } - else - { - return false; - } -} void QtopiaConverter::deinit() { @@ -209,7 +206,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a 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); } 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 @@ -50,8 +50,8 @@ public: */ virtual ~QtopiaConverter(); - virtual bool init(); - virtual void deinit(); + bool init(); + void deinit(); /** * Converts a vcard string to an addressee. |