author | ulf69 <ulf69> | 2004-07-14 14:55:56 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-14 14:55:56 (UTC) |
commit | f2779e5e7742103ce848ab11e6b9fe3661587f0b (patch) (unidiff) | |
tree | f858743398b61aa21eca09abc6d85a34a7d3f436 /kabc | |
parent | cf7175c9a6b96cd11fb7f3cba459f5223aa4aacb (diff) | |
download | kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.zip kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.tar.gz kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.tar.bz2 |
added changes to support qtopia import/export and improved resource support
-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 | |||
@@ -53,4 +53,4 @@ public: | |||
53 | 53 | ||
54 | virtual bool init(); | 54 | bool init(); |
55 | virtual void deinit(); | 55 | void deinit(); |
56 | 56 | ||
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,4 +51,6 @@ bool QtopiaConverter::init() | |||
51 | catDB = new Categories(); | 51 | catDB = new Categories(); |
52 | if (catDB) | 52 | |
53 | { | 53 | if (!catDB) |
54 | return false; | ||
55 | |||
54 | catDB->load( categoryFileName() ); | 56 | catDB->load( categoryFileName() ); |
@@ -56,7 +58,2 @@ bool QtopiaConverter::init() | |||
56 | } | 58 | } |
57 | else | ||
58 | { | ||
59 | return false; | ||
60 | } | ||
61 | } | ||
62 | 59 | ||
@@ -211,3 +208,3 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
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); |
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: | |||
52 | 52 | ||
53 | virtual bool init(); | 53 | bool init(); |
54 | virtual void deinit(); | 54 | void deinit(); |
55 | 55 | ||