| -rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 8 |
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 @@ -119,7 +119,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa 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) ); @@ -166,7 +166,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa 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) ); @@ -249,11 +249,11 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa // 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"), "")); |