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$ -#include "sharpdtmconverter.h" +#include "olaccessconverter.h" -#include <sl/slcategories.h> #include <libkdepim/ksyncprofile.h> //US #include <qpe/categoryselect.h> @@ -38,17 +37,17 @@ $Id$ using namespace KABC; -using namespace SlCategory; -SharpDTMConverter::SharpDTMConverter() : catDB(0) +OlaccessConverter::OlaccessConverter() { } -SharpDTMConverter::~SharpDTMConverter() +OlaccessConverter::~OlaccessConverter() { deinit(); } -bool SharpDTMConverter::init() +bool OlaccessConverter::init() { +#if 0 catDB = new SlCategory::SlCategories(); @@ -57,9 +56,11 @@ bool SharpDTMConverter::init() // catDB->load( categoryFileName() ); +#endif return true; } -void SharpDTMConverter::deinit() +void OlaccessConverter::deinit() { +#if 0 if (catDB) { @@ -67,7 +68,8 @@ void SharpDTMConverter::deinit() catDB = 0; } +#endif } - -bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) +#if 0 +bool OlaccessConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr ) { SlZDataBase* db = (SlZDataBase*)database; @@ -80,5 +82,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa // name - //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); + //qDebug("OlaccessConverter::sharpToAddressee check if the fileAs transformation works!!"); addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); //addr.setName(db->readField(ZdbAdrs::FullName)); @@ -95,5 +97,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa emailstr.replace( QRegExp(";"), " " ); emailstr.replace( QRegExp(":"), " " ); - //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); + //qDebug("OlaccessConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1()); QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace()); bool defE = false; @@ -222,6 +224,6 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa QString gen = db->readField(ZdbAdrs::Gender); - //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); - //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); + //qDebug("OlaccessConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1()); + //qDebug("OlaccessConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); if (gen == "1") addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); @@ -265,5 +267,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa //US QStringList groupList() const; - //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" ); + //qDebug("OlaccessConverter::sharpToAddressee please check that the categories will be converted" ); QArray<int> catArray = db->readCategories(); QString cat; @@ -280,5 +282,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa } -bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) +bool OlaccessConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact ) { bool cellHome = false, cellWork = false; @@ -290,5 +292,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da database->writeField(ZdbAdrs::Suffix, addr.suffix()); - //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); + //qDebug("OlaccessConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() ); QString formattedName = addr.formattedName(); if ( formattedName.isEmpty() ) { @@ -306,6 +308,6 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da // email - //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!"); - //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee"); + //qDebug("OlaccessConverter::addresseeToSharp check which seperator we need here for the emails!!"); + //qDebug("OlaccessConverter::addresseeToSharp its probably the same from sharpToAddressee"); QString emails = addr.emails().join(" "); database->writeField(ZdbAdrs::Emails, emails ); @@ -374,7 +376,7 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" ); - //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); - //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); - //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); + //qDebug("OlaccessConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1()); + //qDebug("OlaccessConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?"); + //qDebug("OlaccessConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee"); if (gt == "male") database->writeField(ZdbAdrs::Gender, "1"); @@ -406,5 +408,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da - //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works"); + //qDebug("OlaccessConverter::addresseeToSharp please check if category transformation works"); return true; @@ -412,5 +414,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da -bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact ) +bool OlaccessConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact ) { QStringList list = addr.categories(); @@ -432,10 +434,10 @@ bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* datab if ( !(res = database->updateCategories(contact, ids) )) - qDebug("SharpDTMConverter::Error updating categories"); + qDebug("OlaccessConverter::Error updating categories"); return res; } - -QDate SharpDTMConverter::convertDate( QString s) +#endif +QDate OlaccessConverter::convertDate( QString s) { QDate dt = KGlobal::locale()->readDate( s ); |