[Kde-imaging] extragear/libs/libkexiv2

[Gilles Caulier]

SVN commit 671260 by cgilles:

libkexiv2 from trunk : Port to QT4/KDE4 done to 95%.

Warning this code is not yet tested ! It just compile. regression test need to be done later, when digiKam will be ported to QT4/KDE4

Marcel, QTextCodec::heuristicContentMatch method has disapear in Qt4.
I don't know how to fix it actually. Please take a look...

CCMAIL: kde-imaging at kde.org
CCMAIL: digikam-devel at kde.org
CCMAIL: marcel.wiesweg at gmx.de
	   


 M  +5 -1      kexiv2.cpp  


--- trunk/extragear/libs/libkexiv2/kexiv2.cpp #671259:671260
@@ -2379,6 +2379,10 @@
     //QTextCodec *utf8Codec   = QTextCodec::codecForName("utf8");
     QTextCodec *localCodec  = QTextCodec::codecForLocale();
 
+/*
+    FIXME: Marcel, QTextCodec::heuristicContentMatch method has disapear in Qt4.
+           I don't know how to fix it actually. Please take a look...
+
     // make heuristic match
     int latin1Score = latin1Codec->heuristicContentMatch(value.c_str(), value.length());
     int localScore  = localCodec->heuristicContentMatch(value.c_str(), value.length());
@@ -2394,7 +2398,7 @@
             length = strlen(value.c_str());
         return localCodec->toUnicode(value.c_str(), length);
     }
-    else
+    else*/
         return QString::fromLatin1(value.c_str());
 }