dtm sync fix

author: zautrix <zautrix> 2004-10-15 14:52:41 (UTC)
committer: zautrix <zautrix> 2004-10-15 14:52:41 (UTC)
commit: 5073db0790d4ac053624b5468107deaa9957315d (patch) (unidiff)
tree: c40971cc49e8bc3ef455953bdc725ab5fde8b215
parent: 4f276d80bd977401d656851515474cc00c661e5b (diff)
download: kdepimpi-5073db0790d4ac053624b5468107deaa9957315d.zip
kdepimpi-5073db0790d4ac053624b5468107deaa9957315d.tar.gz
kdepimpi-5073db0790d4ac053624b5468107deaa9957315d.tar.bz2
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"), ""));
author	zautrix <zautrix>	2004-10-15 14:52:41 (UTC)
committer	zautrix <zautrix>	2004-10-15 14:52:41 (UTC)
commit	5073db0790d4ac053624b5468107deaa9957315d (patch) (unidiff)
tree	c40971cc49e8bc3ef455953bdc725ab5fde8b215
parent	4f276d80bd977401d656851515474cc00c661e5b (diff)
download	kdepimpi-5073db0790d4ac053624b5468107deaa9957315d.zip kdepimpi-5073db0790d4ac053624b5468107deaa9957315d.tar.gz kdepimpi-5073db0790d4ac053624b5468107deaa9957315d.tar.bz2

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
119	homeaddress.setType(Address::Home);	119	homeaddress.setType(Address::Home);
120	//US homeaddress.setPostOfficeBox( "" );	120	//US homeaddress.setPostOfficeBox( "" );
121	//US homeaddress.setExtended( "" );	121	//US homeaddress.setExtended( "" );
122	homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet) );	122	homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet).replace( QRegExp("\\r"), ""));
123	homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) );	123	homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) );
124	homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) );	124	homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) );
125	homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) );	125	homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) );
@@ -166,7 +166,7 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
166	businessaddress.setType(Address::Work);	166	businessaddress.setType(Address::Work);
167	//US businessaddress.setPostOfficeBox( "" );	167	//US businessaddress.setPostOfficeBox( "" );
168	//US businessaddress.setExtended( "" );	168	//US businessaddress.setExtended( "" );
169	businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet) );	169	businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet).replace( QRegExp("\\r"), "") );
170	businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) );	170	businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) );
171	businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) );	171	businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) );
172	businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) );	172	businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) );
@@ -249,11 +249,11 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
249		249
250	// others	250	// others
251	//US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available.	251	//US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available.
252	QString notes = db->readField(ZdbAdrs::Notes);	252	//QString notes = db->readField(ZdbAdrs::Notes);
253	//notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n";	253	//notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n";
254	if ( addr.url().isEmpty() )	254	if ( addr.url().isEmpty() )
255	addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) );	255	addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) );
256	addr.setNote( db->readField(ZdbAdrs::Notes) );	256	addr.setNote( db->readField(ZdbAdrs::Notes).replace( QRegExp("\\r"), ""));
257		257
258		258
259		259