[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kaddressbook/xxport
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2005-01-08 1:35:07
Message-ID: 20050108013507.47C8D1A2B8 () office ! kde ! org
[Download RAW message or body]

CVS commit by tokoe: 

Test the charset of the vcard, Apple's addressbook exports them in utf16.


  M +9 -1      vcard_xxport.cpp   1.29


--- kdepim/kaddressbook/xxport/vcard_xxport.cpp  #1.28:1.29
@@ -28,4 +28,5 @@
 #include <qlayout.h>
 #include <qpushbutton.h>
+#include <qtextcodec.h>
 
 #include <kabc/vcardconverter.h>
@@ -196,5 +197,12 @@ KABC::AddresseeList VCardXXPort::importC
           file.close();
           if ( rawData.size() > 0 ) {
-            QString data = QString::fromUtf8( rawData.data(), rawData.size() );
+            QTextCodec *codec = QTextCodec::codecForContent( rawData.data(), 50 );
+
+            QString data;
+            if ( codec )
+              data = codec->toUnicode( rawData.data(), rawData.size() );
+            else
+              data = QString::fromUtf8( rawData.data(), rawData.size() );
+
             addrList += parseVCard( data );
           }


[prev in list] [next in list] [prev in thread] [next in thread]