author | zautrix <zautrix> | 2005-10-27 10:34:56 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-27 10:34:56 (UTC) |
commit | 29c7448b3c54e8d579732d10f144e12f7167c3c3 (patch) (unidiff) | |
tree | ae613037eaa897d2f7bc084d0b9e6954c630d985 /kabc/plugins/olaccess/olaccessconverter.cpp | |
parent | eb83d8b5542de9ca0c421ad6aca2913b502bbe78 (diff) | |
download | kdepimpi-29c7448b3c54e8d579732d10f144e12f7167c3c3.zip kdepimpi-29c7448b3c54e8d579732d10f144e12f7167c3c3.tar.gz kdepimpi-29c7448b3c54e8d579732d10f144e12f7167c3c3.tar.bz2 |
commit
Diffstat (limited to 'kabc/plugins/olaccess/olaccessconverter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kabc/plugins/olaccess/olaccessconverter.cpp | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/kabc/plugins/olaccess/olaccessconverter.cpp b/kabc/plugins/olaccess/olaccessconverter.cpp index 4adcae4..e95f3cb 100644 --- a/kabc/plugins/olaccess/olaccessconverter.cpp +++ b/kabc/plugins/olaccess/olaccessconverter.cpp | |||
@@ -30,7 +30,6 @@ $Id$ | |||
30 | 30 | ||
31 | 31 | ||
32 | #include "sharpdtmconverter.h" | 32 | #include "olaccessconverter.h" |
33 | 33 | ||
34 | #include <sl/slcategories.h> | ||
35 | #include <libkdepim/ksyncprofile.h> | 34 | #include <libkdepim/ksyncprofile.h> |
36 | //US #include <qpe/categoryselect.h> | 35 | //US #include <qpe/categoryselect.h> |
@@ -38,17 +37,17 @@ $Id$ | |||
38 | 37 | ||
39 | using namespace KABC; | 38 | using namespace KABC; |
40 | using namespace SlCategory; | ||
41 | 39 | ||
42 | SharpDTMConverter::SharpDTMConverter() : catDB(0) | 40 | OlaccessConverter::OlaccessConverter() |
43 | { | 41 | { |
44 | } | 42 | } |
45 | 43 | ||
46 | SharpDTMConverter::~SharpDTMConverter() | 44 | OlaccessConverter::~OlaccessConverter() |
47 | { | 45 | { |
48 | deinit(); | 46 | deinit(); |
49 | } | 47 | } |
50 | 48 | ||
51 | bool SharpDTMConverter::init() | 49 | bool OlaccessConverter::init() |
52 | { | 50 | { |
51 | #if 0 | ||
53 | catDB = new SlCategory::SlCategories(); | 52 | catDB = new SlCategory::SlCategories(); |
54 | 53 | ||
@@ -57,9 +56,11 @@ bool SharpDTMConverter::init() | |||
57 | 56 | ||
58 | // catDB->load( categoryFileName() ); | 57 | // catDB->load( categoryFileName() ); |
58 | #endif | ||
59 | return true; | 59 | return true; |
60 | } | 60 | } |
61 | 61 | ||
62 | void SharpDTMConverter::deinit() | 62 | void OlaccessConverter::deinit() |
63 | { | 63 | { |
64 | #if 0 | ||
64 | if (catDB) | 65 | if (catDB) |
65 | { | 66 | { |
@@ -67,7 +68,8 @@ void SharpDTMConverter::deinit() | |||
67 | catDB = 0; | 68 | catDB = 0; |
68 | } | 69 | } |
70 | #endif | ||
69 | } | 71 | } |
70 | 72 | #if 0 | |
71 | bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) | 73 | bool OlaccessConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) |
72 | { | 74 | { |
73 | SlZDataBase* db = (SlZDataBase*)database; | 75 | SlZDataBase* db = (SlZDataBase*)database; |
@@ -80,5 +82,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
80 | 82 | ||
81 | // name | 83 | // name |
82 | //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); | 84 | //qDebug("OlaccessConverter::sharpToAddressee check if the fileAs transformation works!!"); |
83 | addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); | 85 | addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); |
84 | //addr.setName(db->readField(ZdbAdrs::FullName)); | 86 | //addr.setName(db->readField(ZdbAdrs::FullName)); |
@@ -95,5 +97,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
95 | emailstr.replace( QRegExp(";"), " " ); | 97 | emailstr.replace( QRegExp(";"), " " ); |
96 | emailstr.replace( QRegExp(":"), " " ); | 98 | emailstr.replace( QRegExp(":"), " " ); |
97 | //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); | 99 | //qDebug("OlaccessConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); |
98 | QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); | 100 | QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); |
99 | bool defE = false; | 101 | bool defE = false; |
@@ -222,6 +224,6 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
222 | 224 | ||
223 | QString gen = db->readField(ZdbAdrs::Gender); | 225 | QString gen = db->readField(ZdbAdrs::Gender); |
224 | //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); | 226 | //qDebug("OlaccessConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); |
225 | //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); | 227 | //qDebug("OlaccessConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); |
226 | if (gen == "1") | 228 | if (gen == "1") |
227 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); | 229 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); |
@@ -265,5 +267,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
265 | //US QStringList groupList() const; | 267 | //US QStringList groupList() const; |
266 | 268 | ||
267 | //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" ); | 269 | //qDebug("OlaccessConverter::sharpToAddressee please check that the categories will be converted" ); |
268 | QArray<int> catArray = db->readCategories(); | 270 | QArray<int> catArray = db->readCategories(); |
269 | QString cat; | 271 | QString cat; |
@@ -280,5 +282,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
280 | } | 282 | } |
281 | 283 | ||
282 | bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) | 284 | bool OlaccessConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) |
283 | { | 285 | { |
284 | bool cellHome = false, cellWork = false; | 286 | bool cellHome = false, cellWork = false; |
@@ -290,5 +292,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
290 | database->writeField(ZdbAdrs::Suffix, addr.suffix()); | 292 | database->writeField(ZdbAdrs::Suffix, addr.suffix()); |
291 | 293 | ||
292 | //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); | 294 | //qDebug("OlaccessConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); |
293 | QString formattedName = addr.formattedName(); | 295 | QString formattedName = addr.formattedName(); |
294 | if ( formattedName.isEmpty() ) { | 296 | if ( formattedName.isEmpty() ) { |
@@ -306,6 +308,6 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
306 | 308 | ||
307 | 309 | ||
308 | //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!"); | 310 | //qDebug("OlaccessConverter::addresseeToSharp check which seperator we need here for the emails!!"); |
309 | //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee"); | 311 | //qDebug("OlaccessConverter::addresseeToSharp its probably the same from sharpToAddressee"); |
310 | QString emails = addr.emails().join(" "); | 312 | QString emails = addr.emails().join(" "); |
311 | database->writeField(ZdbAdrs::Emails, emails ); | 313 | database->writeField(ZdbAdrs::Emails, emails ); |
@@ -374,7 +376,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
374 | 376 | ||
375 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); | 377 | QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); |
376 | //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); | 378 | //qDebug("OlaccessConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); |
377 | //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); | 379 | //qDebug("OlaccessConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); |
378 | //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); | 380 | //qDebug("OlaccessConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); |
379 | if (gt == "male") | 381 | if (gt == "male") |
380 | database->writeField(ZdbAdrs::Gender, "1"); | 382 | database->writeField(ZdbAdrs::Gender, "1"); |
@@ -406,5 +408,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
406 | 408 | ||
407 | 409 | ||
408 | //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); | 410 | //qDebug("OlaccessConverter::addresseeToSharp please check if category transformation works"); |
409 | 411 | ||
410 | return true; | 412 | return true; |
@@ -412,5 +414,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da | |||
412 | 414 | ||
413 | 415 | ||
414 | bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact ) | 416 | bool OlaccessConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact ) |
415 | { | 417 | { |
416 | QStringList list = addr.categories(); | 418 | QStringList list = addr.categories(); |
@@ -432,10 +434,10 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab | |||
432 | 434 | ||
433 | if ( !(res = database->updateCategories(contact, ids) )) | 435 | if ( !(res = database->updateCategories(contact, ids) )) |
434 | qDebug("SharpDTMConverter::Error updating categories"); | 436 | qDebug("OlaccessConverter::Error updating categories"); |
435 | 437 | ||
436 | return res; | 438 | return res; |
437 | } | 439 | } |
438 | 440 | #endif | |
439 | QDate SharpDTMConverter::convertDate( QString s) | 441 | QDate OlaccessConverter::convertDate( QString s) |
440 | { | 442 | { |
441 | QDate dt = KGlobal::locale()->readDate( s ); | 443 | QDate dt = KGlobal::locale()->readDate( s ); |