dtm sync fix

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
@@ -118,9 +118,9 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       Address homeaddress;
       homeaddress.setType(Address::Home);
 //US    homeaddress.setPostOfficeBox( "" );
 //US    homeaddress.setExtended( "" );
-      homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) );
+      homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet).replace( QRegExp("\\r"), ""));
       homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) );
       homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) );
       homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) );
       homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) );
@@ -165,9 +165,9 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       Address businessaddress;
       businessaddress.setType(Address::Work);
 //US    businessaddress.setPostOfficeBox( "" );
 //US    businessaddress.setExtended( "" );
-      businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) );
+      businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet).replace( QRegExp("\\r"), "") );
       businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) );
       businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) );
       businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) );
       businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) );
@@ -248,13 +248,13 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     addr.setNickName( db->readField(ZdbAdrs::Nickname) );
 
     // others
     //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";
     if ( addr.url().isEmpty() )
         addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) );
-    addr.setNote( db->readField(ZdbAdrs::Notes) );
+    addr.setNote( db->readField(ZdbAdrs::Notes).replace( QRegExp("\\r"), ""));
 
 
 
 //US    QString groups() const { return find( Qtopia::Groups ); }