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
@@ -110,25 +110,25 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 
     // home
     if ((!db->readField(ZdbAdrs::HomeStreet).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeCity).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeState).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeZip).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeCountry).isEmpty()))
     {
       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) );
 
       addr.insertAddress( homeaddress );
     }
 
     if (!db->readField(ZdbAdrs::HomePhone).isEmpty())
     {
       PhoneNumber homephone;
       homephone.setType( PhoneNumber::Home );
@@ -157,25 +157,25 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 
     // business
     if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessState).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessCountry).isEmpty()))
     {
       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) );
 
       addr.insertAddress( businessaddress );
     }
 
 
     if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty())
     {
       PhoneNumber businessphone;
@@ -240,29 +240,29 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
     addr.insertCustom( "KADDRESSBOOK", "X-Children", db->readField(ZdbAdrs::Children) );
 
 
     QDate birthd = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Birthday) );
     //qDebug("birtd %s ", birthd.toString().latin1());
     if (birthd.isValid())
       addr.setBirthday( birthd );
 
     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 ); }
 //US    QStringList groupList() const;
 
 	//qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" );
     QArray<int> catArray = db->readCategories();
     QString cat;
 
     for ( unsigned int i=0; i < catArray.size(); i++ ) {
       cat = catDB->label(catArray[i]);