summaryrefslogtreecommitdiffabout
path: root/kaddressbook
authorzautrix <zautrix>2005-09-28 00:19:15 (UTC)
committer zautrix <zautrix>2005-09-28 00:19:15 (UTC)
commite6112c5497b334d6dc38108b37963c5e803413d3 (patch) (unidiff)
treeb9afccc4169ffcb3b360d79e659a4b1119f2aef4 /kaddressbook
parentfa126dfea03b4ebed9a4eed4f2104f93abb72e22 (diff)
downloadkdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.zip
kdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.tar.gz
kdepimpi-e6112c5497b334d6dc38108b37963c5e803413d3.tar.bz2
import latin1 kapi
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 91df96d..9a8fa68 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -202,25 +202,31 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
202 int start = 0; 202 int start = 0;
203#ifndef DESKTOP_VERSION 203#ifndef DESKTOP_VERSION
204 while ( start < rawData.size()-2 ) { 204 while ( start < rawData.size()-2 ) {
205 if ( rawData.at( start ) == '\r' ) 205 if ( rawData.at( start ) == '\r' )
206 if ( rawData.at( start+1 ) == '\n' ) 206 if ( rawData.at( start+1 ) == '\n' )
207 if ( rawData.at( start+2 ) == ' ' ) { 207 if ( rawData.at( start+2 ) == ' ' ) {
208 rawData.remove(start,3); 208 rawData.remove(start,3);
209 --start; 209 --start;
210 } 210 }
211 ++start; 211 ++start;
212 } 212 }
213#endif 213#endif
214 addrList = parseVCard( QString::fromUtf8( rawData.data() ) ); 214 int ret = KMessageBox::warningYesNoCancel( 0, i18n("Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages."), i18n("Import Format"), i18n("Utf8"), i18n("Latin1") );
215 if ( ret == KMessageBox::Cancel )
216 return addrList;
217 if ( ret == KMessageBox::Yes )
218 addrList = parseVCard( QString::fromUtf8( rawData.data() ) );
219 else
220 addrList = parseVCard( QString::fromLatin1( rawData.data() ) );
215 } 221 }
216 222
217 } 223 }
218#endif //KAB_EMBEDDED 224#endif //KAB_EMBEDDED
219 225
220 return addrList; 226 return addrList;
221} 227}
222 228
223KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const 229KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
224{ 230{
225 231
226 KABC::VCardTool tool; 232 KABC::VCardTool tool;