TQt4 port k3b

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 134 insertions, 131 deletions

diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
index dd32d08..0e59525 100644
--- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
+++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
@@ -1,11 +1,11 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>base_K3bExternalEncoderConfigWidget</class>
 <author>Sebastian Trueg</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>base_K3bExternalEncoderConfigWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
 &lt;p&gt;K3b comes with a selection of predefined external applications that depends on the installed applications.</string>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -48,7 +48,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QListView">
+                <widget class="TQListView">
                     <column>
                         <property name="text">
                             <string>Name</string>
@@ -86,9 +86,9 @@
                         <cstring>m_viewEncoders</cstring>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -104,14 +104,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>71</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_buttonRemove</cstring>
                             </property>
@@ -119,7 +119,7 @@
                                 <string>Remove</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_buttonEdit</cstring>
                             </property>
@@ -127,7 +127,7 @@
                                 <string>Edit...</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_buttonAdd</cstring>
                             </property>
@@ -141,7 +141,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kactivelabel.h</includehint>
 </includehints>
diff --git a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui
index 9f3fb5a..d6a472b 100644
--- a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui
+++ b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui
@@ -1,11 +1,11 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>base_K3bExternalEncoderEditWidget</class>
 <author>Sebastian Trueg</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>base_K3bExternalEncoderEditWidget</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox3</cstring>
             </property>
@@ -41,7 +41,7 @@
                         <cstring>m_editName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -49,7 +49,7 @@
                         <string>Name:</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>textLabel3</cstring>
                     </property>
@@ -59,7 +59,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -105,7 +105,7 @@ Please insert the command used to encode the audio data. The command has to read
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox4</cstring>
             </property>
@@ -116,7 +116,7 @@ Please insert the command used to encode the audio data. The command has to read
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_checkSwapByteOrder</cstring>
                     </property>
@@ -131,7 +131,7 @@ Please insert the command used to encode the audio data. The command has to read
 &lt;p&gt;If the resulting audio file sounds bad it is highly likely that the byte order is wrong and this option has to be checked.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>m_checkWriteWaveHeader</cstring>
                     </property>
@@ -154,7 +154,7 @@ Please insert the command used to encode the audio data. The command has to read
     <tabstop>m_editExtension</tabstop>
     <tabstop>m_editCommand</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index 4eb0218..52cd0d0 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include <qregexp.h>
-#include <qfile.h>
+#include <tqregexp.h>
+#include <tqfile.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -57,10 +57,10 @@ static const char s_riffHeader[] =
 
 
 
-static K3bExternalEncoderCommand commandByExtension( const QString& extension )
+static K3bExternalEncoderCommand commandByExtension( const TQString& extension )
 {
-  QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() );
-  for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it )
+  TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() );
+  for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it )
     if( (*it).extension == extension )
       return *it;
 
@@ -78,8 +78,8 @@ public:
   }
 
   K3bProcess* process;
-  QString fileName;
-  QString extension;
+  TQString fileName;
+  TQString extension;
   K3b::Msf length;
 
   K3bExternalEncoderCommand cmd;
@@ -87,20 +87,20 @@ public:
   bool initialized;
 
   // the metaData we support
-  QString artist;
-  QString title;
-  QString comment;
-  QString trackNumber;
-  QString cdArtist;
-  QString cdTitle;
-  QString cdComment;
-  QString year;
-  QString genre;
+  TQString artist;
+  TQString title;
+  TQString comment;
+  TQString trackNumber;
+  TQString cdArtist;
+  TQString cdTitle;
+  TQString cdComment;
+  TQString year;
+  TQString genre;
 };
 
 
-K3bExternalEncoder::K3bExternalEncoder( QObject* parent, const char* name )
-  : K3bAudioEncoder( parent, name )
+K3bExternalEncoder::K3bExternalEncoder( TQObject* tqparent, const char* name )
+  : K3bAudioEncoder( tqparent, name )
 {
   d = new Private();
 }
@@ -113,7 +113,7 @@ K3bExternalEncoder::~K3bExternalEncoder()
 }
 
 
-void K3bExternalEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value )
+void K3bExternalEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value )
 {
   switch( f ) {
   case META_TRACK_TITLE:
@@ -168,7 +168,7 @@ void K3bExternalEncoder::slotExternalProgramFinished( KProcess* p )
 }
 
 
-bool K3bExternalEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& length )
+bool K3bExternalEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length )
 {
   d->fileName = filename;
   d->extension = ext;
@@ -176,8 +176,8 @@ bool K3bExternalEncoder::openFile( const QString& ext, const QString& filename,
   d->length = length;
 
   // delete existing files as some programs (like flac for example) might refuse to overwrite files
-  if( QFile::exists( filename ) )
-    QFile::remove( filename );
+  if( TQFile::exists( filename ) )
+    TQFile::remove( filename );
 
   return true;
 }
@@ -189,7 +189,7 @@ void K3bExternalEncoder::closeFile()
 }
 
 
-bool K3bExternalEncoder::initEncoderInternal( const QString& extension )
+bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
 {
   d->initialized = true;
 
@@ -207,42 +207,42 @@ bool K3bExternalEncoder::initEncoderInternal( const QString& extension )
   d->process->setSplitStdout(true);
   d->process->setRawStdin(true);
 
-  connect( d->process, SIGNAL(processExited(KProcess*)),
-	   this, SLOT(slotExternalProgramFinished(KProcess*)) );
-  connect( d->process, SIGNAL(stderrLine(const QString&)),
-	   this, SLOT(slotExternalProgramOutputLine(const QString&)) );
-  connect( d->process, SIGNAL(stdoutLine(const QString&)),
-	   this, SLOT(slotExternalProgramOutputLine(const QString&)) );
+  connect( d->process, TQT_SIGNAL(processExited(KProcess*)),
+	   this, TQT_SLOT(slotExternalProgramFinished(KProcess*)) );
+  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&)) );
 
 
   // create the commandline
-  QStringList params = QStringList::split( ' ', d->cmd.command, false );
-  for( QStringList::iterator it = params.begin(); it != params.end(); ++it ) {
-    (*it).replace( "%f", d->fileName );
-    (*it).replace( "%a", d->artist );
-    (*it).replace( "%t", d->title );
-    (*it).replace( "%c", d->comment );
-    (*it).replace( "%y", d->year );
-    (*it).replace( "%m", d->cdTitle );
-    (*it).replace( "%r", d->cdArtist );
-    (*it).replace( "%x", d->cdComment );
-    (*it).replace( "%n", d->trackNumber );
-    (*it).replace( "%g", d->genre );
+  TQStringList params = TQStringList::split( ' ', d->cmd.command, false );
+  for( TQStringList::iterator it = params.begin(); it != params.end(); ++it ) {
+    (*it).tqreplace( "%f", d->fileName );
+    (*it).tqreplace( "%a", d->artist );
+    (*it).tqreplace( "%t", d->title );
+    (*it).tqreplace( "%c", d->comment );
+    (*it).tqreplace( "%y", d->year );
+    (*it).tqreplace( "%m", d->cdTitle );
+    (*it).tqreplace( "%r", d->cdArtist );
+    (*it).tqreplace( "%x", d->cdComment );
+    (*it).tqreplace( "%n", d->trackNumber );
+    (*it).tqreplace( "%g", d->genre );
 
     *d->process << *it;
   }
 
 
   kdDebug() << "***** external parameters:" << endl;
-  const QValueList<QCString>& args = d->process->args();
-  QString s;
-  for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
+  const TQValueList<TQCString>& args = d->process->args();
+  TQString s;
+  for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) {
     s += *it + " ";
   }
   kdDebug() << s << flush << endl;
 
   // set one general error message
-  setLastError( i18n("Command failed: %1").arg( s ) );
+  setLastError( i18n("Command failed: %1").tqarg( s ) );
   
   if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
     if( d->cmd.writeWaveHeader )
@@ -251,9 +251,9 @@ bool K3bExternalEncoder::initEncoderInternal( const QString& extension )
       return true;
   }
   else {
-    QString commandName = d->cmd.command.section( QRegExp("\\s+"), 0 );
+    TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 );
     if( !KStandardDirs::findExe( commandName ).isEmpty() )
-      setLastError( i18n("Could not find program '%1'").arg(commandName) );
+      setLastError( i18n("Could not find program '%1'").tqarg(commandName) );
 
     return false;
   }
@@ -271,8 +271,8 @@ bool K3bExternalEncoder::writeWaveHeader()
   }
   
   // write the wave size
-  Q_INT32 dataSize( d->length.audioBytes() );
-  Q_INT32 wavSize( dataSize + 44 - 8 );
+  TQ_INT32 dataSize( d->length.audioBytes() );
+  TQ_INT32 wavSize( dataSize + 44 - 8 );
   char c[4];
 
   c[0] = (wavSize   >> 0 ) & 0xff;
@@ -305,7 +305,7 @@ bool K3bExternalEncoder::writeWaveHeader()
 }
 
 
-long K3bExternalEncoder::encodeInternal( const char* data, Q_ULONG len )
+long K3bExternalEncoder::encodeInternal( const char* data, TQ_ULONG len )
 {
   if( !d->initialized )
     if( !initEncoderInternal( d->extension ) )
@@ -347,33 +347,33 @@ long K3bExternalEncoder::encodeInternal( const char* data, Q_ULONG len )
 }
 
 
-void K3bExternalEncoder::slotExternalProgramOutputLine( const QString& line )
+void K3bExternalEncoder::slotExternalProgramOutputLine( const TQString& line )
 {
   kdDebug() << "(" << d->cmd.name << ") " << line << endl;
 }
 
 
-QStringList K3bExternalEncoder::extensions() const
+TQStringList K3bExternalEncoder::extensions() const
 {
-  QStringList el;
-  QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() );
-  for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it )
+  TQStringList el;
+  TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() );
+  for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it )
     el.append( (*it).extension );
 
   return el;
 }
 
 
-QString K3bExternalEncoder::fileTypeComment( const QString& ext ) const
+TQString K3bExternalEncoder::fileTypeComment( const TQString& ext ) const
 {
   return commandByExtension( ext ).name;
 }
 
 
-K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( QWidget* parent, 
+K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( TQWidget* tqparent, 
 							       const char* name ) const
 {
-  return new K3bExternalEncoderSettingsWidget( parent, name );
+  return new K3bExternalEncoderSettingsWidget( tqparent, name );
 }
 
 
diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h
index 1612927..266299f 100644
--- a/plugins/encoder/external/k3bexternalencoder.h
+++ b/plugins/encoder/external/k3bexternalencoder.h
@@ -27,38 +27,39 @@ class KProcess;
 class K3bExternalEncoder : public K3bAudioEncoder
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  K3bExternalEncoder( QObject* parent = 0, const char* name = 0 );
+  K3bExternalEncoder( TQObject* tqparent = 0, const char* name = 0 );
   ~K3bExternalEncoder();
 
-  QStringList extensions() const;
+  TQStringList extensions() const;
   
-  QString fileTypeComment( const QString& ) const;
+  TQString fileTypeComment( const TQString& ) const;
 
   int pluginSystemVersion() const { return 3; }
 
-  K3bPluginConfigWidget* createConfigWidget( QWidget* parent, 
+  K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent, 
 					     const char* name ) const;
 
   /**
    * reimplemented since the external program is intended to write the file
    * TODO: allow writing to stdout.
    */
-  bool openFile( const QString& ext, const QString& filename, const K3b::Msf& length );
+  bool openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length );
   void closeFile();
 
   class Command;
 
  private slots:
   void slotExternalProgramFinished( KProcess* );
-  void slotExternalProgramOutputLine( const QString& );
+  void slotExternalProgramOutputLine( const TQString& );
 
  private:
   void finishEncoderInternal();
-  bool initEncoderInternal( const QString& extension );
-  long encodeInternal( const char* data, Q_ULONG len );
-  void setMetaDataInternal( MetaDataField, const QString& );
+  bool initEncoderInternal( const TQString& extension );
+  long encodeInternal( const char* data, TQ_ULONG len );
+  void setMetaDataInternal( MetaDataField, const TQString& );
   bool writeWaveHeader();
 
   class Private;
diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp
index 5dcfb23..57a0858 100644
--- a/plugins/encoder/external/k3bexternalencodercommand.cpp
+++ b/plugins/encoder/external/k3bexternalencodercommand.cpp
@@ -23,17 +23,17 @@
 #include <kstandarddirs.h>
 
 
-QValueList<K3bExternalEncoderCommand> K3bExternalEncoderCommand::readCommands()
+TQValueList<K3bExternalEncoderCommand> K3bExternalEncoderCommand::readCommands()
 {
   KConfig* c = k3bcore->config();
 
   c->setGroup( "K3bExternalEncoderPlugin" );
 
-  QValueList<K3bExternalEncoderCommand> cl;
+  TQValueList<K3bExternalEncoderCommand> cl;
 
-  QStringList cmds = c->readListEntry( "commands" );
-  for( QStringList::iterator it = cmds.begin(); it != cmds.end(); ++it ) {
-    QStringList cmdString = c->readListEntry( "command_" + *it );
+  TQStringList cmds = c->readListEntry( "commands" );
+  for( TQStringList::iterator it = cmds.begin(); it != cmds.end(); ++it ) {
+    TQStringList cmdString = c->readListEntry( "command_" + *it );
     K3bExternalEncoderCommand cmd;
     cmd.name = cmdString[0];
     cmd.extension = cmdString[1];
diff --git a/plugins/encoder/external/k3bexternalencodercommand.h b/plugins/encoder/external/k3bexternalencodercommand.h
index 3351191..7e9db51 100644
--- a/plugins/encoder/external/k3bexternalencodercommand.h
+++ b/plugins/encoder/external/k3bexternalencodercommand.h
@@ -16,8 +16,8 @@
 #ifndef _K3B_EXTERNAL_ENCODER_COMMAND_H_
 #define _K3B_EXTERNAL_ENCODER_COMMAND_H_
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
 
 class K3bExternalEncoderCommand
 {
@@ -27,14 +27,14 @@ public:
       writeWaveHeader(false) {
   }
 
-  QString name;
-  QString extension;
-  QString command;
+  TQString name;
+  TQString extension;
+  TQString command;
 
   bool swapByteOrder;
   bool writeWaveHeader;
 
-  static QValueList<K3bExternalEncoderCommand> readCommands();
+  static TQValueList<K3bExternalEncoderCommand> readCommands();
 };
 
 #endif
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
index 3ab59c7..3daf9ad 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
@@ -17,10 +17,10 @@
 
 #include <k3bcore.h>
 
-#include <qcheckbox.h>
-#include <qlayout.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqlayout.h>
+#include <tqlistview.h>
+#include <tqpushbutton.h>
 
 #include <klineedit.h>
 #include <kmessagebox.h>
@@ -30,12 +30,12 @@
 
 
 
-K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( QWidget* parent )
+K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( TQWidget* tqparent )
   : KDialogBase( Swallow,
 		 i18n("Editing external audio encoder"),
 		 Ok|Cancel,
 		 Ok,
-		 parent )
+		 tqparent )
 {
   m_editW = new base_K3bExternalEncoderEditWidget( this );
   setMainWidget( m_editW );
@@ -86,7 +86,7 @@ void K3bExternalEncoderEditDialog::slotOk()
 			i18n("Please specify the command line."),
 			i18n("No command line specified") );
   }
-  else if( !m_editW->m_editCommand->text().contains( "%f" ) ) {
+  else if( !m_editW->m_editCommand->text().tqcontains( "%f" ) ) {
     KMessageBox::error( this, 
 			i18n("Please add the output filename (%f) to the command line."),
 			i18n("No filename specified") );
@@ -105,28 +105,28 @@ void K3bExternalEncoderEditDialog::slotOk()
 class K3bExternalEncoderSettingsWidget::Private
 {
 public:
-  QMap<QListViewItem*, K3bExternalEncoderCommand> commands;
+  TQMap<TQListViewItem*, K3bExternalEncoderCommand> commands;
 };
 
 
-K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( QWidget* parent, const char* name )
-  : K3bPluginConfigWidget( parent, name )
+K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( TQWidget* tqparent, const char* name )
+  : K3bPluginConfigWidget( tqparent, name )
 {
   d = new Private();
 
   w = new base_K3bExternalEncoderConfigWidget( this );
-  QHBoxLayout* lay = new QHBoxLayout( this );
+  TQHBoxLayout* lay = new TQHBoxLayout( this );
   lay->setMargin( 0 );
   lay->addWidget( w );
 
-  connect( w->m_viewEncoders, SIGNAL(selectionChanged()),
-	   this, SLOT(slotSelectionChanged()) );
-  connect( w->m_buttonAdd, SIGNAL(clicked()),
-	   this, SLOT(slotNewCommand()) );
-  connect( w->m_buttonEdit, SIGNAL(clicked()),
-	   this, SLOT(slotEditCommand()) );
-  connect( w->m_buttonRemove, SIGNAL(clicked()),
-	   this, SLOT(slotRemoveCommand()) );
+  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()) );
 
   m_editDlg = new K3bExternalEncoderEditDialog( this );
 }
@@ -143,9 +143,9 @@ void K3bExternalEncoderSettingsWidget::slotNewCommand()
   // clear the dialog
   m_editDlg->setCommand( K3bExternalEncoderCommand() );
 
-  if( m_editDlg->exec() == QDialog::Accepted ) {
+  if( m_editDlg->exec() == TQDialog::Accepted ) {
     K3bExternalEncoderCommand cmd = m_editDlg->currentCommand();
-    d->commands.insert( new QListViewItem( w->m_viewEncoders, 
+    d->commands.insert( new TQListViewItem( w->m_viewEncoders, 
 					   w->m_viewEncoders->lastItem(),
 					   cmd.name,
 					   cmd.extension,
@@ -164,9 +164,9 @@ void K3bExternalEncoderSettingsWidget::slotSelectionChanged()
 
 void K3bExternalEncoderSettingsWidget::slotEditCommand()
 {
-  if( QListViewItem* item = w->m_viewEncoders->selectedItem() ) {
+  if( TQListViewItem* item = w->m_viewEncoders->selectedItem() ) {
     m_editDlg->setCommand( d->commands[item] );
-    if( m_editDlg->exec() == QDialog::Accepted ) {
+    if( m_editDlg->exec() == TQDialog::Accepted ) {
       d->commands[item] = m_editDlg->currentCommand();
     }
   }
@@ -175,7 +175,7 @@ void K3bExternalEncoderSettingsWidget::slotEditCommand()
 
 void K3bExternalEncoderSettingsWidget::slotRemoveCommand()
 {
-  if( QListViewItem* item = w->m_viewEncoders->selectedItem() ) {
+  if( TQListViewItem* item = w->m_viewEncoders->selectedItem() ) {
     d->commands.erase( item );
     delete item;
   }
@@ -187,11 +187,11 @@ void K3bExternalEncoderSettingsWidget::loadConfig()
   d->commands.clear();
   w->m_viewEncoders->clear();
 
-  QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() );
-  for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin();
+  TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() );
+  for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin();
        it != cmds.end(); ++it ) {
     K3bExternalEncoderCommand& cmd = *it;
-    d->commands.insert( new QListViewItem( w->m_viewEncoders, 
+    d->commands.insert( new TQListViewItem( w->m_viewEncoders, 
 					   w->m_viewEncoders->lastItem(),
 					   cmd.name,
 					   cmd.extension,
@@ -207,10 +207,10 @@ void K3bExternalEncoderSettingsWidget::saveConfig()
   c->deleteGroup( "K3bExternalEncoderPlugin", true );
   c->setGroup( "K3bExternalEncoderPlugin" );
 
-  QStringList cmdNames;
-  for( QMapIterator<QListViewItem*, K3bExternalEncoderCommand> it = d->commands.begin();
+  TQStringList cmdNames;
+  for( TQMapIterator<TQListViewItem*, K3bExternalEncoderCommand> it = d->commands.begin();
        it != d->commands.end(); ++it ) {
-    QStringList cmd;
+    TQStringList cmd;
     cmd << it.data().name << it.data().extension << it.data().command;
     if( it.data().swapByteOrder )
       cmd << "swap";
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.h b/plugins/encoder/external/k3bexternalencoderconfigwidget.h
index 4f6dd47..c8c607a 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.h
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.h
@@ -27,9 +27,10 @@
 class K3bExternalEncoderEditDialog : public KDialogBase
 {
   Q_OBJECT
+  TQ_OBJECT
   
  public:
-  K3bExternalEncoderEditDialog( QWidget* parent );
+  K3bExternalEncoderEditDialog( TQWidget* tqparent );
   ~K3bExternalEncoderEditDialog();
 
   K3bExternalEncoderCommand currentCommand() const;
@@ -46,9 +47,10 @@ class K3bExternalEncoderEditDialog : public KDialogBase
 class K3bExternalEncoderSettingsWidget : public K3bPluginConfigWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  K3bExternalEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 );
+  K3bExternalEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 );
   ~K3bExternalEncoderSettingsWidget();
 
  public slots: