7 files changed, 14 insertions, 58 deletions
diff --git a/plugins/decoder/mp3/CMakeLists.txt b/plugins/decoder/mp3/CMakeLists.txt
index 2c31bae..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,13 +33,14 @@ 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}
 )
 
 
 ##### other data ################################
 
-install( FILES k3bmaddecoder.plugin
+tde_create_translated_desktop(
+  SOURCE k3bmaddecoder.plugin
   DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins
 )
diff --git a/plugins/decoder/mp3/Makefile.am b/plugins/decoder/mp3/Makefile.am
deleted file mode 100644
index a2befe9..0000000
--- a/plugins/decoder/mp3/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(taglib_includes) $(all_includes)
-
-kde_module_LTLIBRARIES = libk3bmaddecoder.la
-
-libk3bmaddecoder_la_SOURCES = k3bmad.cpp k3bmaddecoder.cpp
-
-libk3bmaddecoder_la_LIBADD = $(LIB_TDECORE) $(MAD_LIB) $(taglib_libs) ../../../libk3b/libk3b.la
-libk3bmaddecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-
-pluginsdir = $(kde_datadir)/k3b/plugins
-plugins_DATA = k3bmaddecoder.plugin
-
-METASOURCES = AUTO
diff --git a/plugins/decoder/mp3/configure.in.bot b/plugins/decoder/mp3/configure.in.bot
deleted file mode 100644
index 0ee4872..0000000
--- a/plugins/decoder/mp3/configure.in.bot
+++ /dev/null
@@ -1,11 +0,0 @@
-echo ""
-
-if test -n "$MAD_LIB"; then
-	echo "K3b - Mp3 decoding support (libmad):         yes"
-else
-	echo "K3b - Mp3 decoding support (libmad):          no"
-if test "$ac_cv_use_libmad" = "yes"; then
-	echo "K3b -     You are missing the libmad headers and libraries."
-	echo "K3b -     The Mp3 decoding plugin won't be compiled."
-fi
-fi
diff --git a/plugins/decoder/mp3/configure.in.in b/plugins/decoder/mp3/configure.in.in
deleted file mode 100644
index 9da5da7..0000000
--- a/plugins/decoder/mp3/configure.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-dnl === libmad MPEG decoder check - begin ===
-AC_ARG_WITH(
-	libmad, 
-	AS_HELP_STRING([--without-libmad], [build K3b without libmad support (default=no)]), 
-	[ac_cv_use_libmad=$withval], 
-	[ac_cv_use_libmad=yes]
-)
-
-if test "$ac_cv_use_libmad" = "yes"; then
-  MAD_LIB=""
-  KDE_CHECK_HEADER(mad.h, [
-	KDE_CHECK_LIB(mad, mad_synth_frame, [
-		MAD_LIB="-lmad"
-		AC_DEFINE(HAVE_LIBMAD,1,[defined if you have libmad headers and libraries])],
-		[],
-		$all_libraries
-	)
-  ])
-  AC_SUBST(MAD_LIB)
-
-fi
-
-AM_CONDITIONAL(include_MP3, [test -n "$MAD_LIB"])
-dnl === libmad MPeg decoder check - end ===
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:
diff --git a/plugins/decoder/mp3/k3bmaddecoder.plugin b/plugins/decoder/mp3/k3bmaddecoder.plugin
index 69fbbb8..2acb7ba 100644
--- a/plugins/decoder/mp3/k3bmaddecoder.plugin
+++ b/plugins/decoder/mp3/k3bmaddecoder.plugin
@@ -1,9 +1,9 @@
 [K3b Plugin]
-Lib=libk3bmaddecoder
-Group=AudioDecoder
 Name=K3b MAD Decoder
+Comment=Decoding module to decode MPEG 1 Layer III files
 Author=Sebastian Trueg
 Email=trueg@k3b.org
 Version=3.1
-Comment=Decoding module to decode MPEG 1 Layer III files
 License=GPL
+Group=AudioDecoder
+Lib=libk3bmaddecoder