7 files changed, 12 insertions, 57 deletions
diff --git a/plugins/encoder/lame/CMakeLists.txt b/plugins/encoder/lame/CMakeLists.txt
index 940ed62..ebee326 100644
--- a/plugins/encoder/lame/CMakeLists.txt
+++ b/plugins/encoder/lame/CMakeLists.txt
@@ -37,6 +37,7 @@ tde_add_kpart( libk3blameencoder AUTOMOC
 
 ##### other data ################################
 
-install( FILES k3blameencoder.plugin
+tde_create_translated_desktop(
+  SOURCE k3blameencoder.plugin
   DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins
 )
diff --git a/plugins/encoder/lame/Makefile.am b/plugins/encoder/lame/Makefile.am
deleted file mode 100644
index 15e310e..0000000
--- a/plugins/encoder/lame/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3bdevice $(all_includes)
-
-kde_module_LTLIBRARIES = libk3blameencoder.la
-
-libk3blameencoder_la_SOURCES = base_k3blameencodersettingswidget.ui \
-	base_k3bmanualbitratesettingswidget.ui \
-	k3blameencoder.cpp
-
-libk3blameencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDECORE) -lmp3lame
-libk3blameencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-
-pluginsdir = $(kde_datadir)/k3b/plugins
-plugins_DATA = k3blameencoder.plugin
-
-METASOURCES = AUTO
diff --git a/plugins/encoder/lame/configure.in.bot b/plugins/encoder/lame/configure.in.bot
deleted file mode 100644
index 5bb35c9..0000000
--- a/plugins/encoder/lame/configure.in.bot
+++ /dev/null
@@ -1,11 +0,0 @@
-echo ""
-
-if test x$have_lame = xyes; then
-	echo "K3b - Lame Mp3 encoder plugin:               yes"
-else
-	echo "K3b - Lame Mp3 encoder plugin                 no"
-if test "$ac_cv_use_lame" = "yes"; then
-	echo "K3b -     You are missing the Lame headers and libraries."
-	echo "K3b -     The Lame Mp3 encoding plugin won't be compiled."
-fi
-fi
diff --git a/plugins/encoder/lame/configure.in.in b/plugins/encoder/lame/configure.in.in
deleted file mode 100644
index 11ce49d..0000000
--- a/plugins/encoder/lame/configure.in.in
+++ /dev/null
@@ -1,20 +0,0 @@
-dnl === test for LAME - begin ====
-AC_ARG_WITH(
-	lame, 
-	AS_HELP_STRING([--without-lame], [build K3b without LAME support (default=no)]), 
-	[ac_cv_use_lame=$withval], 
-	[ac_cv_use_lame=yes]
-)
-
-have_lame=no
-if test "$ac_cv_use_lame" = "yes"; then
-  KDE_CHECK_HEADERS(lame/lame.h, [
-  	KDE_CHECK_LIB(mp3lame, lame_init, [
-  		have_lame=yes
-  		AC_DEFINE(HAVE_LAME,1,[defined if you have the lame header and lib])
-  		], [], $all_libraries -lm)
-  ])
-fi
-
-AM_CONDITIONAL(include_LAME, [test x$have_lame = xyes])
-dnl === test for LAME - end ====
diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp
index 127422b..3be21df 100644
--- a/plugins/encoder/lame/k3blameencoder.cpp
+++ b/plugins/encoder/lame/k3blameencoder.cpp
@@ -23,7 +23,7 @@
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdialogbase.h>
@@ -427,10 +427,10 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* parent, co
   // TODO: add whatsthis help for the quality level.
   //  TQString qualityLevelWhatsThis = i18n("<p>");
 
-  connect( m_w->m_buttonManualSettings, TQT_SIGNAL(clicked()),
-	   this, TQT_SLOT(slotShowManualSettings()) );
-  connect( m_w->m_sliderQuality, TQT_SIGNAL(valueChanged(int)),
-	   this, TQT_SLOT(slotQualityLevelChanged(int)) );
+  connect( m_w->m_buttonManualSettings, TQ_SIGNAL(clicked()),
+	   this, TQ_SLOT(slotShowManualSettings()) );
+  connect( m_w->m_sliderQuality, TQ_SIGNAL(valueChanged(int)),
+	   this, TQ_SLOT(slotQualityLevelChanged(int)) );
 
   updateManualSettingsLabel();
   slotQualityLevelChanged( 5 );
diff --git a/plugins/encoder/lame/k3blameencoder.h b/plugins/encoder/lame/k3blameencoder.h
index 2e3ca09..7e2a95b 100644
--- a/plugins/encoder/lame/k3blameencoder.h
+++ b/plugins/encoder/lame/k3blameencoder.h
@@ -29,7 +29,7 @@ class KDialogBase;
 
 class K3bLameEncoder : public K3bAudioEncoder
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
@@ -65,7 +65,7 @@ class K3bLameEncoder : public K3bAudioEncoder
 
 class K3bLameEncoderSettingsWidget : public K3bPluginConfigWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/plugins/encoder/lame/k3blameencoder.plugin b/plugins/encoder/lame/k3blameencoder.plugin
index 432bc58..2c92052 100644
--- a/plugins/encoder/lame/k3blameencoder.plugin
+++ b/plugins/encoder/lame/k3blameencoder.plugin
@@ -1,9 +1,9 @@
 [K3b Plugin]
-Lib=libk3blameencoder
-Group=AudioEncoder
 Name=K3b Lame Mp3 Encoder
+Comment=Encoding module to encode MPEG1 Layer III (mp3) files
 Author=Sebastian Trueg
 Email=trueg@k3b.org
 Version=3.0
-Comment=Encoding module to encode MPEG1 Layer III (mp3) files
 License=GPL
+Group=AudioEncoder
+Lib=libk3blameencoder