| author | zautrix <zautrix> | 2005-01-18 09:31:59 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-01-18 09:31:59 (UTC) |
| commit | 2d6776d79732f6771885a549de5c37f9e75f7641 (patch) (side-by-side diff) | |
| tree | 5dc2abf48a99e2a35f8e1458f731b3ef9210ac7e /kabc/plugins | |
| parent | 522486966ecf041a6e49913b6e420d58d4284837 (diff) | |
| download | kdepimpi-2d6776d79732f6771885a549de5c37f9e75f7641.zip kdepimpi-2d6776d79732f6771885a549de5c37f9e75f7641.tar.gz kdepimpi-2d6776d79732f6771885a549de5c37f9e75f7641.tar.bz2 | |
fixed merging
| -rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp index ae4cfbb..8165b4c 100644 --- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp +++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp @@ -82,3 +82,4 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!"); - addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); // needs fix + addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); + addr.setName(db->readField(ZdbAdrs::FullName)); @@ -224,7 +225,8 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited"); - - if (gen == "male") + if (gen == "1") addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male"); - else if (gen == "female") + else if (gen == "2") addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female"); + else + addr.insertCustom( "KADDRESSBOOK", "X-Gender", "undef"); @@ -236,3 +238,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); - } + } else + addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", " "); + @@ -300,3 +304,3 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da database->writeField(ZdbAdrs::FileAs, formattedName); - database->writeField(ZdbAdrs::FullName, formattedName); + database->writeField(ZdbAdrs::FullName, addr.name()); @@ -375,5 +379,5 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* da if (gt == "male") - database->writeField(ZdbAdrs::Gender, "male"); + database->writeField(ZdbAdrs::Gender, "1"); else if (gt == "female") - database->writeField(ZdbAdrs::Gender, "female"); + database->writeField(ZdbAdrs::Gender, "2"); else |