8 files changed, 24 insertions, 38 deletions
diff --git a/plugins/encoder/external/CMakeLists.txt b/plugins/encoder/external/CMakeLists.txt
index e2b9f1a..334dbea 100644
--- a/plugins/encoder/external/CMakeLists.txt
+++ b/plugins/encoder/external/CMakeLists.txt
@@ -38,6 +38,7 @@ tde_add_kpart( libk3bexternalencoder AUTOMOC
 
 ##### other data ################################
 
-install( FILES k3bexternalencoder.plugin
+tde_create_translated_desktop(
+  SOURCE k3bexternalencoder.plugin
   DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins
 )
diff --git a/plugins/encoder/external/Makefile.am b/plugins/encoder/external/Makefile.am
deleted file mode 100644
index b092cde..0000000
--- a/plugins/encoder/external/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 = libk3bexternalencoder.la
-
-libk3bexternalencoder_la_SOURCES = base_k3bexternalencoderconfigwidget.ui \
-	base_k3bexternalencodereditwidget.ui k3bexternalencoder.cpp \
-	k3bexternalencoderconfigwidget.cpp k3bexternalencodercommand.cpp
-
-libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDECORE) $(LIB_TQT) $(LIB_TDEUI)
-libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-
-pluginsdir = $(kde_datadir)/k3b/plugins
-plugins_DATA = k3bexternalencoder.plugin
-
-METASOURCES = AUTO
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index 2a3ccba..bf487ed 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqregexp.h>
 #include <tqfile.h>
@@ -207,12 +207,12 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
   d->process->setSplitStdout(true);
   d->process->setRawStdin(true);
 
-  connect( d->process, TQT_SIGNAL(processExited(TDEProcess*)),
-	   this, TQT_SLOT(slotExternalProgramFinished(TDEProcess*)) );
-  connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)),
-	   this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) );
-  connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)),
-	   this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) );
+  connect( d->process, TQ_SIGNAL(processExited(TDEProcess*)),
+	   this, TQ_SLOT(slotExternalProgramFinished(TDEProcess*)) );
+  connect( d->process, TQ_SIGNAL(stderrLine(const TQString&)),
+	   this, TQ_SLOT(slotExternalProgramOutputLine(const TQString&)) );
+  connect( d->process, TQ_SIGNAL(stdoutLine(const TQString&)),
+	   this, TQ_SLOT(slotExternalProgramOutputLine(const TQString&)) );
 
 
   // create the commandline
diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h
index 1ef865a..4ab5930 100644
--- a/plugins/encoder/external/k3bexternalencoder.h
+++ b/plugins/encoder/external/k3bexternalencoder.h
@@ -26,7 +26,7 @@ class TDEProcess;
 
 class K3bExternalEncoder : public K3bAudioEncoder
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/plugins/encoder/external/k3bexternalencoder.plugin b/plugins/encoder/external/k3bexternalencoder.plugin
index 2faaa3a..de0a5d3 100644
--- a/plugins/encoder/external/k3bexternalencoder.plugin
+++ b/plugins/encoder/external/k3bexternalencoder.plugin
@@ -1,9 +1,9 @@
 [K3b Plugin]
-Lib=libk3bexternalencoder
-Group=AudioEncoder
 Name=K3b External Audio Encoder
+Comment=Encoding module that allows specifying an encoding commmand
 Author=Sebastian Trueg
 Email=trueg@k3b.org
 Version=4.0
-Comment=Encoding module that allows specifying an encoding commmand
 License=GPL
+Group=AudioEncoder
+Lib=libk3bexternalencoder
diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp
index 7ab974a..1d68328 100644
--- a/plugins/encoder/external/k3bexternalencodercommand.cpp
+++ b/plugins/encoder/external/k3bexternalencodercommand.cpp
@@ -20,7 +20,7 @@
 #include <k3bcore.h>
 
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 
 TQValueList<K3bExternalEncoderCommand> K3bExternalEncoderCommand::readCommands()
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
index 0f89798..18a986d 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
@@ -119,14 +119,14 @@ K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( TQWidget* pa
   lay->setMargin( 0 );
   lay->addWidget( w );
 
-  connect( w->m_viewEncoders, TQT_SIGNAL(selectionChanged()),
-	   this, TQT_SLOT(slotSelectionChanged()) );
-  connect( w->m_buttonAdd, TQT_SIGNAL(clicked()),
-	   this, TQT_SLOT(slotNewCommand()) );
-  connect( w->m_buttonEdit, TQT_SIGNAL(clicked()),
-	   this, TQT_SLOT(slotEditCommand()) );
-  connect( w->m_buttonRemove, TQT_SIGNAL(clicked()),
-	   this, TQT_SLOT(slotRemoveCommand()) );
+  connect( w->m_viewEncoders, TQ_SIGNAL(selectionChanged()),
+	   this, TQ_SLOT(slotSelectionChanged()) );
+  connect( w->m_buttonAdd, TQ_SIGNAL(clicked()),
+	   this, TQ_SLOT(slotNewCommand()) );
+  connect( w->m_buttonEdit, TQ_SIGNAL(clicked()),
+	   this, TQ_SLOT(slotEditCommand()) );
+  connect( w->m_buttonRemove, TQ_SIGNAL(clicked()),
+	   this, TQ_SLOT(slotRemoveCommand()) );
 
   m_editDlg = new K3bExternalEncoderEditDialog( this );
 }
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.h b/plugins/encoder/external/k3bexternalencoderconfigwidget.h
index 8fe19c6..68027f0 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.h
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.h
@@ -26,7 +26,7 @@
 
 class K3bExternalEncoderEditDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   
  public:
@@ -46,7 +46,7 @@ class K3bExternalEncoderEditDialog : public KDialogBase
 
 class K3bExternalEncoderSettingsWidget : public K3bPluginConfigWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public: