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 | |||
@@ -48,14 +48,14 @@ public: | |||
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Destructor. | 50 | * Destructor. |
51 | */ | 51 | */ |
52 | virtual ~OpieConverter(); | 52 | virtual ~OpieConverter(); |
53 | 53 | ||
54 | virtual bool init(); | 54 | bool init(); |
55 | virtual void deinit(); | 55 | void deinit(); |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Converts a vcard string to an addressee. | 58 | * Converts a vcard string to an addressee. |
59 | * | 59 | * |
60 | * @param contact The opie contact. | 60 | * @param contact The opie contact. |
61 | * @param addr The addressee. | 61 | * @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,22 +46,19 @@ QtopiaConverter::~QtopiaConverter() | |||
46 | deinit(); | 46 | deinit(); |
47 | } | 47 | } |
48 | 48 | ||
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 | return false; | ||
55 | |||
54 | catDB->load( categoryFileName() ); | 56 | catDB->load( categoryFileName() ); |
55 | return true; | 57 | return true; |
56 | } | 58 | } |
57 | else | ||
58 | { | ||
59 | return false; | ||
60 | } | ||
61 | } | ||
62 | 59 | ||
63 | void QtopiaConverter::deinit() | 60 | void QtopiaConverter::deinit() |
64 | { | 61 | { |
65 | if (catDB) | 62 | if (catDB) |
66 | { | 63 | { |
67 | delete catDB; | 64 | delete catDB; |
@@ -206,13 +203,13 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
206 | else if (contact.gender() == PimContact::Female) | 203 | else if (contact.gender() == PimContact::Female) |
207 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); | 204 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); |
208 | 205 | ||
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 | ||
216 | addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() ); | 213 | addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() ); |
217 | if (contact.birthday().isValid()) | 214 | if (contact.birthday().isValid()) |
218 | addr.setBirthday( contact.birthday() ); | 215 | addr.setBirthday( contact.birthday() ); |
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: | |||
47 | 47 | ||
48 | /** | 48 | /** |
49 | * Destructor. | 49 | * Destructor. |
50 | */ | 50 | */ |
51 | virtual ~QtopiaConverter(); | 51 | virtual ~QtopiaConverter(); |
52 | 52 | ||
53 | virtual bool init(); | 53 | bool init(); |
54 | virtual void deinit(); | 54 | void deinit(); |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * Converts a vcard string to an addressee. | 57 | * Converts a vcard string to an addressee. |
58 | * | 58 | * |
59 | * @param contact The qtopia contact. | 59 | * @param contact The qtopia contact. |
60 | * @param addr The addressee. | 60 | * @param addr The addressee. |