3 files changed, 9 insertions, 6 deletions
diff --git a/plugins/decoder/mp3/CMakeLists.txt b/plugins/decoder/mp3/CMakeLists.txt
index 4b180f5..a04a4e9 100644
--- a/plugins/decoder/mp3/CMakeLists.txt
+++ b/plugins/decoder/mp3/CMakeLists.txt
@@ -18,11 +18,13 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libk3bdevice
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
   ${MAD_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
 )
 
 
@@ -31,7 +33,7 @@ link_directories(
 tde_add_kpart( libk3bmaddecoder AUTOMOC
   SOURCES k3bmad.cpp k3bmaddecoder.cpp
   LINK tdecore-shared k3b-shared k3bdevice-shared
-    ${MAD_LIBRARIES}
+    ${MAD_LIBRARIES} ${TAGLIB_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
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();
       }
diff --git a/plugins/decoder/mp3/k3bmaddecoder.h b/plugins/decoder/mp3/k3bmaddecoder.h
index df63a1d..de1fe9e 100644
--- a/plugins/decoder/mp3/k3bmaddecoder.h
+++ b/plugins/decoder/mp3/k3bmaddecoder.h
@@ -26,7 +26,7 @@ extern "C" {
 
 class K3bMadDecoderFactory : public K3bAudioDecoderFactory
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
@@ -44,7 +44,7 @@ class K3bMadDecoderFactory : public K3bAudioDecoderFactory
 
 class K3bMadDecoder : public K3bAudioDecoder
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public: