summaryrefslogtreecommitdiffabout
path: root/kabc
Side-by-side diff
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/vcard/ContentLine.cpp1
-rw-r--r--kabc/vcardformatimpl.cpp8
-rw-r--r--kabc/vcardparser/vcardparser.cpp2
-rw-r--r--kabc/vcardparser/vcardtool.cpp10
4 files changed, 11 insertions, 10 deletions
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index f7e04a9..c368172 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -309,2 +309,3 @@ ContentLine::_assemble()
strRep_ += line.mid( cursor * maxLen );
+ //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
}
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index ede5773..c31af46 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -850,6 +850,6 @@ Agent VCardFormatImpl::readAgentValue( VCARD::ContentLine *cl )
*/
- vstr.replace( QRegExp("\\n"), "\r\n" );
- vstr.replace( QRegExp("\\:"), ":" );
- vstr.replace( QRegExp("\\,"), "," );
- vstr.replace( QRegExp("\\;"), ";" );
+ vstr.replace( QRegExp("\\\\n"), "\r\n" );
+ vstr.replace( QRegExp("\\\\:"), ":" );
+ vstr.replace( QRegExp("\\\\,"), "," );
+ vstr.replace( QRegExp("\\\\;"), ";" );
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 9ea084d..bec2a0c 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -115,3 +115,3 @@ VCard::List VCardParser::parseVCards( const QString& text )
//US vCardLine.setValue( value.replace( "\\n", "\n" ) );
- vCardLine.setValue( value.replace( QRegExp("\\n"), "\n" ) );
+ vCardLine.setValue( value.replace( QRegExp("\\\\n"), "\n" ) );
}
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index 3fb212e..d1f823b 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -814,7 +814,7 @@ Agent VCardTool::parseAgent( const VCardLine &line )
*/
- str.replace( QRegExp("\\n") , "\r\n" );
- str.replace( QRegExp("\\N") , "\r\n" );
- str.replace( QRegExp("\\;") , ";" );
- str.replace( QRegExp("\\:") , ":" );
- str.replace( QRegExp("\\,") , "," );
+ str.replace( QRegExp("\\\\n") , "\r\n" );
+ str.replace( QRegExp("\\\\N") , "\r\n" );
+ str.replace( QRegExp("\\\\;") , ";" );
+ str.replace( QRegExp("\\\\:") , ":" );
+ str.replace( QRegExp("\\\\,") , "," );