7 files changed, 9 insertions, 84 deletions
diff --git a/plugins/decoder/libsndfile/CMakeLists.txt b/plugins/decoder/libsndfile/CMakeLists.txt
index fa387c0..f9a35ed 100644
--- a/plugins/decoder/libsndfile/CMakeLists.txt
+++ b/plugins/decoder/libsndfile/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/libk3bdevice
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${SNDFILE_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -38,6 +39,7 @@ tde_add_kpart( libk3blibsndfiledecoder AUTOMOC
 
 ##### other data ################################
 
-install( FILES k3blibsndfiledecoder.plugin
+tde_create_translated_desktop(
+  SOURCE k3blibsndfiledecoder.plugin
   DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins
 )
diff --git a/plugins/decoder/libsndfile/Makefile.am b/plugins/decoder/libsndfile/Makefile.am
deleted file mode 100644
index b01e30f..0000000
--- a/plugins/decoder/libsndfile/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(all_includes)
-
-kde_module_LTLIBRARIES = libk3blibsndfiledecoder.la
-
-libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
-
-libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -lsndfile
-libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-
-pluginsdir = $(kde_datadir)/k3b/plugins
-plugins_DATA = k3blibsndfiledecoder.plugin
-
-METASOURCES = AUTO
-
diff --git a/plugins/decoder/libsndfile/configure.in.bot b/plugins/decoder/libsndfile/configure.in.bot
deleted file mode 100644
index cf1e4e9..0000000
--- a/plugins/decoder/libsndfile/configure.in.bot
+++ /dev/null
@@ -1,11 +0,0 @@
-echo ""
-
-if $av_cv_sndfile; then
-	echo "K3b - libsndfile audio decoding support:     yes"
-else
-	echo "K3b - libsndfile audio decoding support:      no"
-if test "$ac_cv_use_sndfile" = "yes"; then
-	echo "K3b -     You are missing the libsndfile headers and libraries."
-	echo "K3b -     The libsndfile audio decoding plugin won't be compiled."
-fi
-fi
diff --git a/plugins/decoder/libsndfile/configure.in.in b/plugins/decoder/libsndfile/configure.in.in
deleted file mode 100644
index 6b50a68..0000000
--- a/plugins/decoder/libsndfile/configure.in.in
+++ /dev/null
@@ -1,52 +0,0 @@
-dnl === test for libsndfile - begin ===
-dnl
-dnl Don't use PKG_CHECK, since if there is no pkg-config installed,
-dnl then there is no auto* magic for it either.
-dnl
-dnl Tests copied from tdebase/tdeioslave/thumbnail/
-dnl
-if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-fi
-
-AC_ARG_WITH(
-	sndfile, 
-	AS_HELP_STRING([--without-sndfile], 
-	[build K3b without libsndfile support (default=no)]), 
-	[ac_cv_use_sndfile=$withval], 
-	[ac_cv_use_sndfile=yes]
-)
-
-if test "$ac_cv_use_sndfile" = "yes"; then
-  SNDFILE_CFLAGS=""
-  SNDFILE_LIBS=""
-  if test "$PKG_CONFIG" = "no" ; then
-      ac_cv_sndfile=0
-      echo "*** The pkg-config script could not be found. Make sure it is"
-      echo "*** in your path, or set the PKG_CONFIG environment variable"
-      echo "*** to the full path to pkg-config."
-      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-      if !(`$PKG_CONFIG --exists sndfile`) ; then
-          echo "*** sndfile is not installed."
-          ac_cv_sndfile=0
-      else
-          if !(`$PKG_CONFIG --atleast-version="1.0.2" sndfile`) ; then
-              echo "*** You need at least version 1.0.2 of sndfile."
-              ac_cv_sndfile=0
-          else
-              ac_cv_sndfile=1
-              SNDFILE_CFLAGS=`$PKG_CONFIG --cflags sndfile`
-              SNDFILE_LIBS=`$PKG_CONFIG --libs sndfile`
-          fi
-      fi
-  fi
-
-  AC_DEFINE_UNQUOTED([HAVE_SNDFILE],${ac_cv_sndfile},
-  			[Set to 1 if you have libsndfile.])
-  AC_SUBST(SNDFILE_CFLAGS)
-  AC_SUBST(SNDFILE_LIBS)
-fi
-
-AM_CONDITIONAL(include_AIFF, [test x$ac_cv_sndfile = x1])
-dnl === test for libsndfile - end ===
diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
index ad094a6..6e00aa1 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp
@@ -26,7 +26,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 
 
 #include <math.h>
diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
index 5840ee7..8cf5e97 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h
@@ -24,7 +24,7 @@ class KURL;
 
 class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
@@ -44,7 +44,7 @@ class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory
 
 class K3bLibsndfileDecoder : public K3bAudioDecoder
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin b/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin
index 7ae05f1..f0945fb 100644
--- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin
+++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin
@@ -1,9 +1,9 @@
 [K3b Plugin]
-Lib=libk3blibsndfiledecoder
-Group=AudioDecoder
 Name=K3b Libsndfile Decoder
+Comment=Decoding module to decode audio files supported by libsndfile
 Author=Matthieu Bedouet
 Email=mbedouet@no-log.org
 Version=1.0
-Comment=Decoding module to decode audio files supported by libsndfile
 License=GPL
+Group=AudioDecoder
+Lib=libk3blibsndfiledecoder