summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 6418b54..396be0a 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -121,3 +121,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
//US homeaddress.setExtended( "" );
- homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) );
+ homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet).replace( QRegExp("\\r"), ""));
homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) );
@@ -168,3 +168,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
//US businessaddress.setExtended( "" );
- businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) );
+ businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet).replace( QRegExp("\\r"), "") );
businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) );
@@ -251,3 +251,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
//US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available.
- QString notes = db->readField(ZdbAdrs::Notes);
+ //QString notes = db->readField(ZdbAdrs::Notes);
//notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n";
@@ -255,3 +255,3 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) );
- addr.setNote( db->readField(ZdbAdrs::Notes) );
+ addr.setNote( db->readField(ZdbAdrs::Notes).replace( QRegExp("\\r"), ""));