author | zautrix <zautrix> | 2004-10-13 05:15:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-13 05:15:03 (UTC) |
commit | f08cf9044213a60c87e2bf299665d13a335feff5 (patch) (unidiff) | |
tree | c9c0e8b0f7f7a48dcee8fbdd5b9a467985c78fdd /kabc/vcardparser | |
parent | 308bc78a3ab0d27718070a5ebdf3f019ac570c6b (diff) | |
download | kdepimpi-f08cf9044213a60c87e2bf299665d13a335feff5.zip kdepimpi-f08cf9044213a60c87e2bf299665d13a335feff5.tar.gz kdepimpi-f08cf9044213a60c87e2bf299665d13a335feff5.tar.bz2 |
fixed some newline probs
-rw-r--r-- | kabc/vcardparser/vcardparser.cpp | 2 | ||||
-rw-r--r-- | kabc/vcardparser/vcardtool.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
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 | |||
@@ -104,25 +104,25 @@ VCard::List VCardParser::parseVCards( const QString& text ) | |||
104 | qDebug("****************************************** "); | 104 | qDebug("****************************************** "); |
105 | qDebug("************* WARNING ******************** "); | 105 | qDebug("************* WARNING ******************** "); |
106 | qDebug("****************************************** "); | 106 | qDebug("****************************************** "); |
107 | qDebug("Make sure, the decoding is done after"); | 107 | qDebug("Make sure, the decoding is done after"); |
108 | qDebug("QVariant conversion!"); | 108 | qDebug("QVariant conversion!"); |
109 | qDebug("Insert Line DECODING OKAY, where this is implemented"); | 109 | qDebug("Insert Line DECODING OKAY, where this is implemented"); |
110 | // use for decoding the above code! | 110 | // use for decoding the above code! |
111 | vCardLine.setValue( cs ); | 111 | vCardLine.setValue( cs ); |
112 | } else { | 112 | } else { |
113 | 113 | ||
114 | //qDebug("VCardParser::parseVCards has to be verified"); | 114 | //qDebug("VCardParser::parseVCards has to be verified"); |
115 | //US vCardLine.setValue( value.replace( "\\n", "\n" ) ); | 115 | //US vCardLine.setValue( value.replace( "\\n", "\n" ) ); |
116 | vCardLine.setValue( value.replace( QRegExp("\\n"), "\n" ) ); | 116 | vCardLine.setValue( value.replace( QRegExp("\\\\n"), "\n" ) ); |
117 | } | 117 | } |
118 | 118 | ||
119 | currentVCard.addLine( vCardLine ); | 119 | currentVCard.addLine( vCardLine ); |
120 | } | 120 | } |
121 | // we do not save the start and end tag as vcardline | 121 | // we do not save the start and end tag as vcardline |
122 | if ( (*it).lower().startsWith( "begin:vcard" ) ) { | 122 | if ( (*it).lower().startsWith( "begin:vcard" ) ) { |
123 | inVCard = true; | 123 | inVCard = true; |
124 | //qDebug("VCardParser::parseVCards has to be verified"); | 124 | //qDebug("VCardParser::parseVCards has to be verified"); |
125 | //US currentLine.setLength( 0 ); | 125 | //US currentLine.setLength( 0 ); |
126 | currentLine = ""; | 126 | currentLine = ""; |
127 | currentVCard.clear(); // flush vcard | 127 | currentVCard.clear(); // flush vcard |
128 | continue; | 128 | continue; |
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 | |||
@@ -803,29 +803,29 @@ Agent VCardTool::parseAgent( const VCardLine &line ) | |||
803 | } else { | 803 | } else { |
804 | QString str = line.value().asString(); | 804 | QString str = line.value().asString(); |
805 | 805 | ||
806 | //US using the old implementation instead | 806 | //US using the old implementation instead |
807 | qDebug("VCardTool::parseAgent has to be verified"); | 807 | qDebug("VCardTool::parseAgent has to be verified"); |
808 | /*US | 808 | /*US |
809 | str.replace( "\\n", "\r\n" ); | 809 | str.replace( "\\n", "\r\n" ); |
810 | str.replace( "\\N", "\r\n" ); | 810 | str.replace( "\\N", "\r\n" ); |
811 | str.replace( "\\;", ";" ); | 811 | str.replace( "\\;", ";" ); |
812 | str.replace( "\\:", ":" ); | 812 | str.replace( "\\:", ":" ); |
813 | str.replace( "\\,", "," ); | 813 | str.replace( "\\,", "," ); |
814 | */ | 814 | */ |
815 | str.replace( QRegExp("\\n") , "\r\n" ); | 815 | str.replace( QRegExp("\\\\n") , "\r\n" ); |
816 | str.replace( QRegExp("\\N") , "\r\n" ); | 816 | str.replace( QRegExp("\\\\N") , "\r\n" ); |
817 | str.replace( QRegExp("\\;") , ";" ); | 817 | str.replace( QRegExp("\\\\;") , ";" ); |
818 | str.replace( QRegExp("\\:") , ":" ); | 818 | str.replace( QRegExp("\\\\:") , ":" ); |
819 | str.replace( QRegExp("\\,") , "," ); | 819 | str.replace( QRegExp("\\\\,") , "," ); |
820 | 820 | ||
821 | Addressee::List list = parseVCards( str ); | 821 | Addressee::List list = parseVCards( str ); |
822 | if ( list.count() > 0 ) { | 822 | if ( list.count() > 0 ) { |
823 | Addressee *addr = new Addressee; | 823 | Addressee *addr = new Addressee; |
824 | *addr = list[ 0 ]; | 824 | *addr = list[ 0 ]; |
825 | agent.setAddressee( addr ); | 825 | agent.setAddressee( addr ); |
826 | } | 826 | } |
827 | } | 827 | } |
828 | 828 | ||
829 | return agent; | 829 | return agent; |
830 | } | 830 | } |
831 | 831 | ||