TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

11 files changed, 95 insertions, 93 deletions

diff --git a/kioslave/audiocd/plugins/audiocdencoder.cpp b/kioslave/audiocd/plugins/audiocdencoder.cpp
index 6dfbec18..200534a4 100644
--- a/kioslave/audiocd/plugins/audiocdencoder.cpp
+++ b/kioslave/audiocd/plugins/audiocdencoder.cpp
@@ -78,12 +78,12 @@ void AudioCDEncoder::findAllPlugins(KIO::SlaveBase *slave, TQPtrList<AudioCDEnco
         {
             TQString fileName = *it2;
             kdDebug() << fileName << endl;
-            if (foundEncoders.contains(fileName)) {
+            if (foundEncoders.tqcontains(fileName)) {
                 kdDebug(7117) << "Warning, encoder has been found twice!" << endl; 
                 continue;
             }
             foundEncoders.append(fileName);
-            fileName = fileName.mid(0, fileName.find('.'));
+            fileName = fileName.mid(0, fileName.tqfind('.'));
             void *function = loadPlugin(fileName);
             if(function){
                 void (*functionPointer)(KIO::SlaveBase *, TQPtrList<AudioCDEncoder> &) = (void (*)(KIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders)) function;
diff --git a/kioslave/audiocd/plugins/audiocdencoder.h b/kioslave/audiocd/plugins/audiocdencoder.h
index cac9b2aa..9f58536f 100644
--- a/kioslave/audiocd/plugins/audiocdencoder.h
+++ b/kioslave/audiocd/plugins/audiocdencoder.h
@@ -31,7 +31,7 @@ class AudioCDEncoder {
 public:
   /**
    * Constructor.
-   * @param slave parent that this classes can use to call data() with
+   * @param slave tqparent that this classes can use to call data() with
    * when finished encoding bits.
    */ 
   explicit AudioCDEncoder(KIO::SlaveBase *slave) : ioslave(slave) {};
@@ -120,7 +120,7 @@ public:
   /**
    * Returns the last error message; called when e.g. read() returns -1.
    */
-  virtual TQString lastErrorMessage() const { return TQString::null; }
+  virtual TQString lastErrorMessage() const { return TQString(); }
 
   /**
    * Helper function to load all of the AudioCD Encoders from libraries.
diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp
index 4be1aeb3..fd98f8b4 100644
--- a/kioslave/audiocd/plugins/flac/encoderflac.cpp
+++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp
@@ -53,9 +53,9 @@ public:
 };
 
 #ifdef LEGACY_FLAC
-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
+static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
 #else
-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
+static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
 #endif
 {
     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
@@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St
 }
 
 /*
-static FLAC__SeekableStreamEncoderSeekStatus  SeekCallback(const FLAC__SeekableStreamEncoder *encoder,  FLAC__uint64 absolute_byte_offset, void *client_data)
+static FLAC__SeekableStreamEncoderSeektqStatus  SeekCallback(const FLAC__SeekableStreamEncoder *encoder,  FLAC__uint64 absolute_byte_offset, void *client_data)
 {} ; */
 
 
@@ -177,14 +177,14 @@ void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c
 //    d->metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING);
 //    d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE)
 
-    typedef QPair<TQString, TQVariant> Comment;
+    typedef TQPair<TQString, TQVariant> Comment;
     Comment comments[7] = { Comment("Title", info.trackInfoList[track].get("title")),
 	    	    	    Comment("Artist", info.get("artist")),
 	    	    	    Comment("Album",  info.get("title")),
 	    	    	    Comment("Genre",  info.get("genre")),
 	    	    	    Comment("Tracknumber", TQString::number(track+1)),
 	                    Comment("Comment", comment),
-	    	    	    Comment("Date", TQString::null )};
+	    	    	    Comment("Date", TQString() )};
     if (info.get("Year").toInt() > 0) {
     	TQDateTime dt(TQDate(info.get("Year").toInt(), 1, 1));
     	comments[6] = Comment("Date", dt.toString(Qt::ISODate));
diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.cpp b/kioslave/audiocd/plugins/lame/collectingprocess.cpp
index 42bdf206..58485fa3 100644
--- a/kioslave/audiocd/plugins/lame/collectingprocess.cpp
+++ b/kioslave/audiocd/plugins/lame/collectingprocess.cpp
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -47,8 +47,8 @@ struct CollectingProcess::Private {
 };
 
 
-CollectingProcess::CollectingProcess( TQObject * parent, const char * name )
-  : KProcess( parent, name )
+CollectingProcess::CollectingProcess( TQObject * tqparent, const char * name )
+  : KProcess( tqparent, name )
 {
   d = new Private();
 }
diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.h b/kioslave/audiocd/plugins/lame/collectingprocess.h
index e9f0def4..bd5abca9 100644
--- a/kioslave/audiocd/plugins/lame/collectingprocess.h
+++ b/kioslave/audiocd/plugins/lame/collectingprocess.h
@@ -20,11 +20,11 @@
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
-    the Qt library by Trolltech AS, Norway (or with modified versions
-    of Qt that use the same license as Qt), and distribute linked
+    the TQt library by Trolltech AS, Norway (or with modified versions
+    of TQt that use the same license as TQt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
-    Qt.  If you modify this file, you may extend this exception to
+    TQt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
@@ -45,8 +45,9 @@
  */
 class CollectingProcess : public KProcess {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  CollectingProcess( TQObject * parent = 0, const char * name = 0 );
+  CollectingProcess( TQObject * tqparent = 0, const char * name = 0 );
   ~CollectingProcess();
 
   /** Starts the process in NotifyOnExit mode and writes in to stdin of
diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/kioslave/audiocd/plugins/lame/encoderlame.cpp
index 5e59c6a4..6154145b 100644
--- a/kioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/kioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -126,31 +126,31 @@ void EncoderLame::loadSettings(){
 	if (method == 0) {
 		// Constant Bitrate Encoding
 		args.append("-b");
-		args.append(TQString("%1").arg(bitrates[settings->cbr_bitrate()]));
+		args.append(TQString("%1").tqarg(bitrates[settings->cbr_bitrate()]));
 		d->bitrate = bitrates[settings->cbr_bitrate()];
 		args.append("-q");
-		args.append(TQString("%1").arg(quality));
+		args.append(TQString("%1").tqarg(quality));
 	}
 	else {
 		// Variable Bitrate Encoding
 		if (settings->vbr_average_br()) {
 			args.append("--abr");
-			args.append(TQString("%1").arg(bitrates[settings->vbr_mean_brate()]));
+			args.append(TQString("%1").tqarg(bitrates[settings->vbr_mean_brate()]));
 			d->bitrate = bitrates[settings->vbr_mean_brate()];
 			if (settings->vbr_min_br()){
 				args.append("-b");
-				args.append(TQString("%1").arg(bitrates[settings->vbr_min_brate()]));
+				args.append(TQString("%1").tqarg(bitrates[settings->vbr_min_brate()]));
 			}
 			if (settings->vbr_min_hard())
 				args.append("-F");
 			if (settings->vbr_max_br()){
 				args.append("-B");
-				args.append(TQString("%1").arg(bitrates[settings->vbr_max_brate()]));
+				args.append(TQString("%1").tqarg(bitrates[settings->vbr_max_brate()]));
 			}
 		} else {
 			d->bitrate = 128;
 			args.append("-V");
-			args.append(TQString("%1").arg(quality));
+			args.append(TQString("%1").tqarg(quality));
 		}
 		if ( !settings->vbr_xing_tag() )
 			args.append("-t");
@@ -186,21 +186,21 @@ void EncoderLame::loadSettings(){
 
 	if ( settings->enable_lowpass() ) {
 		args.append("--lowpass");
-		args.append(TQString("%1").arg(settings->lowfilterfreq()));
+		args.append(TQString("%1").tqarg(settings->lowfilterfreq()));
 
 		if (settings->set_lpf_width()){
 			args.append("--lowpass-width");
-			args.append(TQString("%1").arg(settings->lowfilterwidth()));
+			args.append(TQString("%1").tqarg(settings->lowfilterwidth()));
 		}
 	}
 
 	if ( settings->enable_highpass()) {
 		args.append("--hipass");
-		args.append(TQString("%1").arg(settings->highfilterfreq()));
+		args.append(TQString("%1").tqarg(settings->highfilterfreq()));
 
 		if (settings->set_hpf_width()){
 			args.append("--hipass-width");
-			args.append(TQString("%1").arg(settings->highfilterwidth()));
+			args.append(TQString("%1").tqarg(settings->highfilterwidth()));
 		}
 	}
 }
@@ -215,7 +215,7 @@ long EncoderLame::readInit(long /*size*/){
 	TQString prefix = locateLocal("tmp", "");
 	d->tempFile = new KTempFile(prefix, ".mp3");
 	d->tempFile->setAutoDelete(true);
-	d->lastErrorMessage = TQString::null;
+	d->lastErrorMessage = TQString();
 	d->processHasExited = false;
 
 	// -x bitswap
@@ -341,16 +341,16 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c
 	trackInfo.append(info.get("title").toString());
 
 	trackInfo.append("--ty");
-	trackInfo.append(TQString("%1").arg(info.get("year").toString()));
+	trackInfo.append(TQString("%1").tqarg(info.get("year").toString()));
 
 	trackInfo.append("--tc");
 	trackInfo.append(comment);
 
 	trackInfo.append("--tn");
-	trackInfo.append(TQString("%1").arg(track+1));
+	trackInfo.append(TQString("%1").tqarg(track+1));
 
 	const TQString genre = info.get( "genre" ).toString();
-	if ( d->genreList.find( genre ) != d->genreList.end() )
+	if ( d->genreList.tqfind( genre ) != d->genreList.end() )
 	{
 		trackInfo.append("--tg");
 		trackInfo.append(genre);
diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/kioslave/audiocd/plugins/lame/encoderlame.h
index ba02cf4f..1f5044b0 100644
--- a/kioslave/audiocd/plugins/lame/encoderlame.h
+++ b/kioslave/audiocd/plugins/lame/encoderlame.h
@@ -30,6 +30,7 @@ class KProcess;
 class EncoderLame : public TQObject, public AudioCDEncoder {
 
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	EncoderLame(KIO::SlaveBase *slave);
diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
index 74060353..7b7dcf17 100644
--- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
+++ b/kioslave/audiocd/plugins/lame/encoderlameconfig.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EncoderLameConfig</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>LameConfig</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="1">
+        <widget class="TQGroupBox" row="0" column="1">
             <property name="name">
                 <cstring>GroupBox1_2</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_copyright</cstring>
                     </property>
@@ -47,7 +47,7 @@
                         <string>Mark MP3 file as copyrighted.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_original</cstring>
                     </property>
@@ -64,7 +64,7 @@
                         <string>Mark MP3 file as an original.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_iso</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <string>This selects the maximal bitrate used for encoding.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_crc</cstring>
                     </property>
@@ -86,7 +86,7 @@
                         <string>&amp;Error protection</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_id3_tag</cstring>
                     </property>
@@ -105,7 +105,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="0" column="0">
+        <widget class="TQButtonGroup" row="0" column="0">
             <property name="name">
                 <cstring>buttonGroup1</cstring>
             </property>
@@ -116,7 +116,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
+                <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>Layout21</cstring>
                     </property>
@@ -130,7 +130,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel3_2</cstring>
                             </property>
@@ -138,7 +138,7 @@
                                 <string>Low</string>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>kcfg_quality</cstring>
                             </property>
@@ -161,7 +161,7 @@
                                 <enum>NoMarks</enum>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel2_2</cstring>
                             </property>
@@ -171,21 +171,21 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
+                <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Quality:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignLeft</set>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>kcfg_quality</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQComboBox" row="1" column="0" rowspan="1" colspan="2">
                     <item>
                         <property name="text">
                             <string>Stereo</string>
@@ -213,7 +213,7 @@
                         <string>This option controls whether MP3 files are recorded with one or two channels. Note that choosing &lt;i&gt;"Mono"&lt;/i&gt; reduces file size, but also kills the stereo signal.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>kcfg_bitrate_constant</cstring>
                     </property>
@@ -221,7 +221,7 @@
                         <string>Constant bitrate</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="0" column="1">
+                <widget class="TQRadioButton" row="0" column="1">
                     <property name="name">
                         <cstring>kcfg_bitrate_variable</cstring>
                     </property>
@@ -244,14 +244,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>vbr_settings</cstring>
             </property>
@@ -271,7 +271,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox" row="3" column="0">
+                <widget class="TQCheckBox" row="3" column="0">
                     <property name="name">
                         <cstring>kcfg_vbr_average_br</cstring>
                     </property>
@@ -282,7 +282,7 @@
                         <string>This selects the maximal bitrate used for encoding.</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="2" column="1">
+                <widget class="TQComboBox" row="2" column="1">
                     <item>
                         <property name="text">
                             <string>32 kbs</string>
@@ -363,7 +363,7 @@
                         <number>13</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>kcfg_vbr_max_br</cstring>
                     </property>
@@ -377,7 +377,7 @@
                         <string>This selects the maximal bitrate used for encoding.</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_vbr_xing_tag</cstring>
                     </property>
@@ -391,7 +391,7 @@
                         <string>This writes additional information related to VBR as introduced by Xing.</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="3" column="1">
+                <widget class="TQComboBox" row="3" column="1">
                     <item>
                         <property name="text">
                             <string>32 kbs</string>
@@ -472,7 +472,7 @@
                         <number>9</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_vbr_min_hard</cstring>
                     </property>
@@ -483,7 +483,7 @@
                         <string>Minimal &amp;value is a hard limit</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>kcfg_vbr_min_br</cstring>
                     </property>
@@ -497,7 +497,7 @@
                         <string>This selects the minimal bitrate used for encoding.</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <item>
                         <property name="text">
                             <string>32 kbs</string>
@@ -580,7 +580,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>cbr_settings</cstring>
             </property>
@@ -597,7 +597,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel4_2</cstring>
                     </property>
@@ -608,7 +608,7 @@
                         <cstring>kcfg_cbr_bitrate</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>32 kbs</string>
@@ -691,14 +691,14 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>GroupBox83_2</cstring>
             </property>
             <property name="title">
                 <string>Filter Settings</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <property name="hAlign" stdset="0">
@@ -715,7 +715,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>kcfg_enable_lowpass</cstring>
                     </property>
@@ -723,7 +723,7 @@
                         <string>&amp;Lowpass filter cutoff above</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="0">
+                <widget class="TQSpinBox" row="1" column="0">
                     <property name="name">
                         <cstring>kcfg_lowfilterfreq</cstring>
                     </property>
@@ -737,7 +737,7 @@
                         <number>20000</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>kcfg_enable_highpass</cstring>
                     </property>
@@ -745,7 +745,7 @@
                         <string>&amp;Highpass filter cutoff below</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="3" column="0">
+                <widget class="TQSpinBox" row="3" column="0">
                     <property name="name">
                         <cstring>kcfg_highfilterfreq</cstring>
                     </property>
@@ -759,7 +759,7 @@
                         <number>200</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="1">
+                <widget class="TQCheckBox" row="0" column="1">
                     <property name="name">
                         <cstring>kcfg_set_lpf_width</cstring>
                     </property>
@@ -770,7 +770,7 @@
                         <string>Low&amp;pass filter width</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="1">
+                <widget class="TQSpinBox" row="1" column="1">
                     <property name="name">
                         <cstring>kcfg_lowfilterwidth</cstring>
                     </property>
@@ -784,7 +784,7 @@
                         <number>5000</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="1">
+                <widget class="TQCheckBox" row="2" column="1">
                     <property name="name">
                         <cstring>kcfg_set_hpf_width</cstring>
                     </property>
@@ -795,7 +795,7 @@
                         <string>Highpa&amp;ss filter width</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="3" column="1">
+                <widget class="TQSpinBox" row="3" column="1">
                     <property name="name">
                         <cstring>kcfg_highfilterwidth</cstring>
                     </property>
@@ -926,5 +926,5 @@
     <tabstop>kcfg_set_hpf_width</tabstop>
     <tabstop>kcfg_highfilterwidth</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
index 739e1c8f..2caab8e5 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp
@@ -301,7 +301,7 @@ void EncoderVorbis::fillSongInfo( KCDDB::CDInfo info, int track, const TQString
   if( !d->write_vorbis_comments )
     return;
 
-  typedef QPair<TQCString, TQVariant> CommentField;
+  typedef TQPair<TQCString, TQVariant> CommentField;
   TQValueList<CommentField> commentFields;
 
   commentFields.append(CommentField("title", info.trackInfoList[track].get("title")));
diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
index 17000745..5e057de0 100644
--- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
+++ b/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui
@@ -1,10 +1,10 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>EncoderVorbisConfig</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>VorbisConfig</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>kcfg_vorbis_enc_method</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>vorbis_enc_quality</cstring>
                     </property>
@@ -38,7 +38,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>vorbis_enc_bitrate</cstring>
                     </property>
@@ -48,7 +48,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>vorbis_bitrate_settings</cstring>
             </property>
@@ -68,7 +68,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <item>
                         <property name="text">
                             <string>32 kbs</string>
@@ -149,7 +149,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>32 kbs</string>
@@ -230,7 +230,7 @@
                         <number>13</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>kcfg_set_vorbis_min_br</cstring>
                     </property>
@@ -241,7 +241,7 @@
                         <string>M&amp;inimal bitrate:</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>kcfg_set_vorbis_max_br</cstring>
                     </property>
@@ -252,7 +252,7 @@
                         <string>Ma&amp;ximal bitrate:</string>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="2" column="1">
+                <widget class="TQComboBox" row="2" column="1">
                     <item>
                         <property name="text">
                             <string>128 kbs</string>
@@ -285,7 +285,7 @@
                         <number>1</number>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>kcfg_set_vorbis_nominal_br</cstring>
                     </property>
@@ -298,7 +298,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>vorbis_quality_settings</cstring>
             </property>
@@ -340,7 +340,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox193</cstring>
             </property>
@@ -357,7 +357,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>kcfg_vorbis_comments</cstring>
                     </property>
@@ -383,7 +383,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>51</height>
@@ -417,7 +417,7 @@
     <tabstop>kcfg_vorbis_quality</tabstop>
     <tabstop>kcfg_vorbis_comments</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kioslave/audiocd/plugins/wav/encoderwav.cpp b/kioslave/audiocd/plugins/wav/encoderwav.cpp
index 8052ce41..57e455c1 100644
--- a/kioslave/audiocd/plugins/wav/encoderwav.cpp
+++ b/kioslave/audiocd/plugins/wav/encoderwav.cpp
@@ -63,7 +63,7 @@ long EncoderWav::readInit(long byteCount){
     0x00, 0x00, 0x00, 0x00  // 40 byteCount
   };
 
-  Q_INT32 wavSize(byteCount + 44 - 8);
+  TQ_INT32 wavSize(byteCount + 44 - 8);
 
 
   riffHeader[4]   = (wavSize   >> 0 ) & 0xff;