Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 147aca7d8e7fe21364884200823577d0b9ade0a4)

2 files changed, 8 insertions, 6 deletions

diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp
index 671bf4c..9d2ab81 100644
--- a/plugins/decoder/flac/k3bflacdecoder.cpp
+++ b/plugins/decoder/flac/k3bflacdecoder.cpp
@@ -33,6 +33,7 @@
 #ifdef HAVE_TAGLIB
 #include <taglib/tag.h>
 #include <taglib/flacfile.h>
+#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true))
 #endif
 
 #if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
@@ -293,9 +294,9 @@ bool K3bFLACDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate, int
     kdDebug() << "(K3bFLACDecoder) using taglib to read tag" << endl;
     TagLib::FLAC::File f( TQFile::encodeName(filename()) );
     if( f.isOpen() ) {
-      addMetaInfo( META_TITLE, TStringToQString( f.tag()->title() ) );
-      addMetaInfo( META_ARTIST, TStringToQString( f.tag()->artist() ) );
-      addMetaInfo( META_COMMENT, TStringToQString( f.tag()->comment() ) );
+      addMetaInfo( META_TITLE, TStringToTQString( f.tag()->title() ) );
+      addMetaInfo( META_ARTIST, TStringToTQString( f.tag()->artist() ) );
+      addMetaInfo( META_COMMENT, TStringToTQString( f.tag()->comment() ) );
     }
   }
 #endif
diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp
index a28e24b..ece3ea7 100644
--- a/plugins/decoder/mp3/k3bmaddecoder.cpp
+++ b/plugins/decoder/mp3/k3bmaddecoder.cpp
@@ -48,6 +48,7 @@
 #ifdef HAVE_TAGLIB
 #include <taglib/tag.h>
 #include <taglib/mpegfile.h>
+#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true))
 #endif
 
 
@@ -110,11 +111,11 @@ TQString K3bMadDecoder::metaInfo( MetaDataField f )
   if ( file.tag() ) {
       switch( f ) {
       case META_TITLE:
-          return TStringToQString( file.tag()->title() );
+          return TStringToTQString( file.tag()->title() );
       case META_ARTIST:
-          return TStringToQString( file.tag()->artist() );
+          return TStringToTQString( file.tag()->artist() );
       case META_COMMENT:
-          return TStringToQString( file.tag()->comment() );
+          return TStringToTQString( file.tag()->comment() );
       default:
           return TQString();
       }