Diffstat (limited to 'kabc/converter/qtopia/qtopiaconverter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.cpp | 19 |
1 files changed, 8 insertions, 11 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 | |||
@@ -49,15 +49,12 @@ QtopiaConverter::~QtopiaConverter() | |||
49 | bool QtopiaConverter::init() | 49 | bool QtopiaConverter::init() |
50 | { | 50 | { |
51 | catDB = new Categories(); | 51 | catDB = new Categories(); |
52 | if (catDB) | 52 | |
53 | { | 53 | if (!catDB) |
54 | catDB->load( categoryFileName() ); | ||
55 | return true; | ||
56 | } | ||
57 | else | ||
58 | { | ||
59 | return false; | 54 | return false; |
60 | } | 55 | |
56 | catDB->load( categoryFileName() ); | ||
57 | return true; | ||
61 | } | 58 | } |
62 | 59 | ||
63 | void QtopiaConverter::deinit() | 60 | void QtopiaConverter::deinit() |
@@ -209,7 +206,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
209 | if (contact.anniversary().isValid()) { | 206 | if (contact.anniversary().isValid()) { |
210 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); | 207 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); |
211 | //US | 208 | //US |
212 | qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1()); | 209 | qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1()); |
213 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 210 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
214 | } | 211 | } |
215 | 212 | ||
@@ -230,7 +227,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
230 | 227 | ||
231 | //US QString groups() const { return find( Qtopia::Groups ); } | 228 | //US QString groups() const { return find( Qtopia::Groups ); } |
232 | //US QStringList groupList() const; | 229 | //US QStringList groupList() const; |
233 | 230 | ||
234 | QArray<int> catArray = contact.categories(); | 231 | QArray<int> catArray = contact.categories(); |
235 | QString cat; | 232 | QString cat; |
236 | 233 | ||
@@ -239,7 +236,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
239 | if ( !cat.isEmpty() ) | 236 | if ( !cat.isEmpty() ) |
240 | addr.insertCategory( cat ); | 237 | addr.insertCategory( cat ); |
241 | } | 238 | } |
242 | 239 | ||
243 | return true; | 240 | return true; |
244 | } | 241 | } |
245 | 242 | ||