6 files changed, 7 insertions, 100 deletions
diff --git a/plugins/decoder/musepack/CMakeLists.txt b/plugins/decoder/musepack/CMakeLists.txt
index 95fb7ae..71d1e00 100644
--- a/plugins/decoder/musepack/CMakeLists.txt
+++ b/plugins/decoder/musepack/CMakeLists.txt
@@ -40,6 +40,7 @@ tde_add_kpart( libk3bmpcdecoder AUTOMOC
 
 ##### other data ################################
 
-install( FILES k3bmpcdecoder.plugin
+tde_create_translated_desktop(
+  SOURCE k3bmpcdecoder.plugin
   DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins
 )
diff --git a/plugins/decoder/musepack/Makefile.am b/plugins/decoder/musepack/Makefile.am
deleted file mode 100644
index b412ee6..0000000
--- a/plugins/decoder/musepack/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/plugin \
-	-I$(srcdir)/../../../libk3b/core \
-	-I$(srcdir)/../../../libk3bdevice \
-	$(all_includes)
-
-kde_module_LTLIBRARIES = libk3bmpcdecoder.la
-
-libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp
-
-libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI)
-libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-
-pluginsdir = $(kde_datadir)/k3b/plugins
-plugins_DATA = k3bmpcdecoder.plugin
-
-METASOURCES = AUTO
diff --git a/plugins/decoder/musepack/configure.in.bot b/plugins/decoder/musepack/configure.in.bot
deleted file mode 100644
index 8fb871b..0000000
--- a/plugins/decoder/musepack/configure.in.bot
+++ /dev/null
@@ -1,12 +0,0 @@
-echo ""
-
-if test x$have_mpc = xyes; then
-	echo "K3b - Musepack support:                      yes"
-else
-	echo "K3b - Musepack support:                       no"
-if test "$ac_cv_use_mpc" = "yes"; then
-	echo "K3b -     You are missing the Musepack headers and libraries >= 1.1."
-	echo "K3b -     The Musepack audio decoding plugin won't be compiled."
-fi
-fi
-
diff --git a/plugins/decoder/musepack/configure.in.in b/plugins/decoder/musepack/configure.in.in
deleted file mode 100644
index 1500ae3..0000000
--- a/plugins/decoder/musepack/configure.in.in
+++ /dev/null
@@ -1,66 +0,0 @@
-dnl --------- MUSEPACK CHECK ---------------
-
-AC_ARG_WITH(
-	musepack, 
-	AS_HELP_STRING(
-		[--without-musepack], 
-		[build K3b without Musepack audio support (default=no)]),
-	[ac_cv_use_mpc=$withval], 
-	[ac_cv_use_mpc=yes]
-)
-
-have_mpc=no
-if test "$ac_cv_use_mpc" = "yes"; then
-
-  dnl - search for both the new and the old naming -
-
-  KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
-  	KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [
-  		have_mpc=yes
-		MPC_LIBS="-lmpcdec"
-		AC_DEFINE(
-			MPC_HEADER_FILE, 
-			<mpcdec/mpcdec.h>, 
-			[The header to include for MPC decoding.])
-		],
-		[], [], [])
-  ])
-
-  if test "$have_mpc" = "no"; then
-    KDE_CHECK_HEADERS(mpc/mpcdec.h, [
-        KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [
-                have_mpc=yes
-                MPC_LIBS="-lmpcdec"
-                AC_DEFINE(
-                        MPC_HEADER_FILE,
-                        <mpc/mpcdec.h>,
-                        [The header to include for MPC decoding.])
-                ],
-                [], [], [])
-    ])
-  fi
-	
-  if test "$have_mpc" = "no"; then
-    KDE_CHECK_HEADERS(musepack/musepack.h, [
-    	  KDE_CHECK_LIB(musepack, mpc_decoder_setup, [
-  		  have_mpc=yes
-		  MPC_LIBS="-lmusepack"
-		  AC_DEFINE(
-			  MPC_HEADER_FILE, 
-			  <musepack/musepack.h>, 
-			  [The header to include for MPC decoding.]
-		  )
-		  AC_DEFINE(
-			  mpc_bool_t,
-			  BOOL,
-			  [backwards compatibility stuff]
-		  )
-  		  ], [], [])
-    ])
-  fi
-fi
-AC_SUBST(MPC_LIBS)
-
-AM_CONDITIONAL(include_MPC, [test x$have_mpc = xyes])
-
-dnl --------- MUSEPACK CHECK END -----------
diff --git a/plugins/decoder/musepack/k3bmpcdecoder.h b/plugins/decoder/musepack/k3bmpcdecoder.h
index a7f8ae7..aac2312 100644
--- a/plugins/decoder/musepack/k3bmpcdecoder.h
+++ b/plugins/decoder/musepack/k3bmpcdecoder.h
@@ -23,7 +23,7 @@ class K3bMpcWrapper;
 
 class K3bMpcDecoderFactory : public K3bAudioDecoderFactory
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
@@ -41,7 +41,7 @@ class K3bMpcDecoderFactory : public K3bAudioDecoderFactory
 
 class K3bMpcDecoder : public K3bAudioDecoder
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/plugins/decoder/musepack/k3bmpcdecoder.plugin b/plugins/decoder/musepack/k3bmpcdecoder.plugin
index 6e350dc..4404add 100644
--- a/plugins/decoder/musepack/k3bmpcdecoder.plugin
+++ b/plugins/decoder/musepack/k3bmpcdecoder.plugin
@@ -1,9 +1,9 @@
 [K3b Plugin]
-Lib=libk3bmpcdecoder
-Group=AudioDecoder
 Name=K3b Musepack Decoder
+Comment=Decoding module to decode Musepack audio files
 Author=Sebastian Trueg
 Email=trueg@k3b.org
 Version=1.0
-Comment=Decoding module to decode Musepack audio files
 License=GPL
+Group=AudioDecoder
+Lib=libk3bmpcdecoder