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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kaddressbook/xxport
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2005-08-01 15:43:06
Message-ID: 1122910986.068709.19956.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 442088 by tokoe:

Since QTextCodec::codecForContent() has too many false hits, we'll use the static
UTF8 conversion again.

BUG:109961


 M  +1 -9      vcard_xxport.cpp  


--- branches/KDE/3.5/kdepim/kaddressbook/xxport/vcard_xxport.cpp #442087:442088
@@ -27,7 +27,6 @@
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qtextcodec.h>
 
 #include <kabc/vcardconverter.h>
 #include <kdialogbase.h>
@@ -196,14 +195,7 @@
           QByteArray rawData = file.readAll();
           file.close();
           if ( rawData.size() > 0 ) {
-            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() );
-
+            const QString data = QString::fromUtf8( rawData.data(), rawData.size() );
             addrList += parseVCard( data );
           }
 
[prev in list] [next in list] [prev in thread] [next in thread]