-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 | |||
@@ -84,65 +84,65 @@ VCard::List VCardParser::parseVCards( const QString& text ) | |||
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | params = vCardLine.parameterList(); | 87 | params = vCardLine.parameterList(); |
88 | if ( params.contains( "encoding" ) ) { // have to decode the data | 88 | if ( params.contains( "encoding" ) ) { // have to decode the data |
89 | #if 0 | 89 | #if 0 |
90 | QByteArray input, output; | 90 | QByteArray input, output; |
91 | input = value.local8Bit(); | 91 | input = value.local8Bit(); |
92 | if ( vCardLine.parameter( "encoding" ).lower() == "b" ) | 92 | if ( vCardLine.parameter( "encoding" ).lower() == "b" ) |
93 | KCodecs::base64Decode( input, output ); | 93 | KCodecs::base64Decode( input, output ); |
94 | else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) | 94 | else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) |
95 | KCodecs::quotedPrintableDecode( input, output ); | 95 | KCodecs::quotedPrintableDecode( input, output ); |
96 | 96 | ||
97 | //qDebug("VCardParser::parseVCards has to be verified"); | 97 | //qDebug("VCardParser::parseVCards has to be verified"); |
98 | //US I am not sure if this is correct | 98 | //US I am not sure if this is correct |
99 | //US vCardLine.setValue( output ); | 99 | //US vCardLine.setValue( output ); |
100 | QCString cs(output); | 100 | QCString cs(output); |
101 | qDebug("len1 %d len2 %d ",input.size(), output.size( )); | 101 | qDebug("len1 %d len2 %d ",input.size(), output.size( )); |
102 | #endif | 102 | #endif |
103 | QCString cs = value.local8Bit(); | 103 | QCString cs = value.local8Bit(); |
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; |
129 | } | 129 | } |
130 | 130 | ||
131 | if ( (*it).lower().startsWith( "end:vcard" ) ) { | 131 | if ( (*it).lower().startsWith( "end:vcard" ) ) { |
132 | inVCard = false; | 132 | inVCard = false; |
133 | vCardList.append( currentVCard ); | 133 | vCardList.append( currentVCard ); |
134 | //qDebug("VCardParser::parseVCards has to be verified"); | 134 | //qDebug("VCardParser::parseVCards has to be verified"); |
135 | //US currentLine.setLength( 0 ); | 135 | //US currentLine.setLength( 0 ); |
136 | currentLine = ""; | 136 | currentLine = ""; |
137 | currentVCard.clear(); // flush vcard | 137 | currentVCard.clear(); // flush vcard |
138 | continue; | 138 | continue; |
139 | } | 139 | } |
140 | 140 | ||
141 | currentLine = (*it); | 141 | currentLine = (*it); |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | return vCardList; | 145 | return vCardList; |
146 | } | 146 | } |
147 | 147 | ||
148 | QString VCardParser::createVCards( const VCard::List& list ) | 148 | QString VCardParser::createVCards( const VCard::List& list ) |
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 | |||
@@ -783,69 +783,69 @@ VCardLine VCardTool::createSecrecy( const Secrecy &secrecy ) | |||
783 | int type = secrecy.type(); | 783 | int type = secrecy.type(); |
784 | 784 | ||
785 | if ( type == Secrecy::Public ) | 785 | if ( type == Secrecy::Public ) |
786 | line.setValue( "PUBLIC" ); | 786 | line.setValue( "PUBLIC" ); |
787 | else if ( type == Secrecy::Private ) | 787 | else if ( type == Secrecy::Private ) |
788 | line.setValue( "PRIVATE" ); | 788 | line.setValue( "PRIVATE" ); |
789 | else if ( type == Secrecy::Confidential ) | 789 | else if ( type == Secrecy::Confidential ) |
790 | line.setValue( "CONFIDENTIAL" ); | 790 | line.setValue( "CONFIDENTIAL" ); |
791 | 791 | ||
792 | return line; | 792 | return line; |
793 | } | 793 | } |
794 | 794 | ||
795 | Agent VCardTool::parseAgent( const VCardLine &line ) | 795 | Agent VCardTool::parseAgent( const VCardLine &line ) |
796 | { | 796 | { |
797 | Agent agent; | 797 | Agent agent; |
798 | 798 | ||
799 | QStringList params = line.parameterList(); | 799 | QStringList params = line.parameterList(); |
800 | if ( params.contains( "value" ) ) { | 800 | if ( params.contains( "value" ) ) { |
801 | if ( line.parameter( "value" ).lower() == "uri" ) | 801 | if ( line.parameter( "value" ).lower() == "uri" ) |
802 | agent.setUrl( line.value().asString() ); | 802 | agent.setUrl( line.value().asString() ); |
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 | ||
832 | VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent ) | 832 | VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent ) |
833 | { | 833 | { |
834 | VCardLine line( "AGENT" ); | 834 | VCardLine line( "AGENT" ); |
835 | 835 | ||
836 | if ( agent.isIntern() ) { | 836 | if ( agent.isIntern() ) { |
837 | if ( agent.addressee() != 0 ) { | 837 | if ( agent.addressee() != 0 ) { |
838 | Addressee::List list; | 838 | Addressee::List list; |
839 | list.append( *agent.addressee() ); | 839 | list.append( *agent.addressee() ); |
840 | 840 | ||
841 | QString str = createVCards( list, version ); | 841 | QString str = createVCards( list, version ); |
842 | 842 | ||
843 | //US using the old implementation instead | 843 | //US using the old implementation instead |
844 | qDebug("VCardTool::createAgent has to be verified"); | 844 | qDebug("VCardTool::createAgent has to be verified"); |
845 | /*US | 845 | /*US |
846 | str.replace( "\r\n", "\\n" ); | 846 | str.replace( "\r\n", "\\n" ); |
847 | str.replace( ";", "\\;" ); | 847 | str.replace( ";", "\\;" ); |
848 | str.replace( ":", "\\:" ); | 848 | str.replace( ":", "\\:" ); |
849 | str.replace( ",", "\\," ); | 849 | str.replace( ",", "\\," ); |
850 | */ | 850 | */ |
851 | str.replace( QRegExp("\r\n"), "\\n" ); | 851 | str.replace( QRegExp("\r\n"), "\\n" ); |