summaryrefslogtreecommitdiffabout
path: root/kabc
authorulf69 <ulf69>2004-07-14 14:55:56 (UTC)
committer ulf69 <ulf69>2004-07-14 14:55:56 (UTC)
commitf2779e5e7742103ce848ab11e6b9fe3661587f0b (patch) (unidiff)
treef858743398b61aa21eca09abc6d85a34a7d3f436 /kabc
parentcf7175c9a6b96cd11fb7f3cba459f5223aa4aacb (diff)
downloadkdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.zip
kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.tar.gz
kdepimpi-f2779e5e7742103ce848ab11e6b9fe3661587f0b.tar.bz2
added changes to support qtopia import/export and improved resource support
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/converter/opie/opieconverter.h4
-rw-r--r--kabc/converter/qtopia/qtopiaconverter.cpp19
-rw-r--r--kabc/converter/qtopia/qtopiaconverter.h4
3 files changed, 12 insertions, 15 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
@@ -52,6 +52,6 @@ public:
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 /**
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
@@ -50,13 +50,10 @@ 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
@@ -210,5 +207,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
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 }
@@ -231,5 +228,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
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;
@@ -240,5 +237,5 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
240 addr.insertCategory( cat ); 237 addr.insertCategory( cat );
241 } 238 }
242 239
243 return true; 240 return true;
244} 241}
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
@@ -51,6 +51,6 @@ public:
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 /**