TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

103 files changed, 608 insertions, 544 deletions

diff --git a/noatun-plugins/alarm/Makefile.am b/noatun-plugins/alarm/Makefile.am
index 8d2a928..8da06d9 100644
--- a/noatun-plugins/alarm/Makefile.am
+++ b/noatun-plugins/alarm/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(kde_includes)/arts $(all_includes)
+INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde
 kde_module_LTLIBRARIES = noatunwakeup.la
 
 noatunwakeup_la_SOURCES = wakeup.cpp \
diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp
index 72b6d9d..862eb0c 100644
--- a/noatun-plugins/alarm/kminutespinbox.cpp
+++ b/noatun-plugins/alarm/kminutespinbox.cpp
@@ -33,7 +33,7 @@ KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name)
 TQString KMinuteSpinBox::mapValueToText(int v)
 {
 	if(v < 10)
-		return TQString("0%1").arg(v);
+		return TQString("0%1").tqarg(v);
 	else
 		return TQString::number(v);
 }
diff --git a/noatun-plugins/alarm/kminutespinbox.h b/noatun-plugins/alarm/kminutespinbox.h
index 701caad..d29259b 100644
--- a/noatun-plugins/alarm/kminutespinbox.h
+++ b/noatun-plugins/alarm/kminutespinbox.h
@@ -26,9 +26,10 @@
 
 #include <tqspinbox.h>
 
-class KMinuteSpinBox : public QSpinBox
+class KMinuteSpinBox : public TQSpinBox
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	KMinuteSpinBox(int _step = 1, TQWidget *_parent = 0, const char *_name = 0);
 protected:
diff --git a/noatun-plugins/alarm/kpercentspinbox.cpp b/noatun-plugins/alarm/kpercentspinbox.cpp
index 3b16c97..ea5a170 100644
--- a/noatun-plugins/alarm/kpercentspinbox.cpp
+++ b/noatun-plugins/alarm/kpercentspinbox.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-			kpercentspinbox.cpp  - QSpinbox with % 
+			kpercentspinbox.cpp  - TQSpinbox with % 
                       -------------------
 		begin    : Sun Apr 15 CEST 2001
 		copyright: (C) 2001 by Mickael Marchand <mikmak@freenux.org>
diff --git a/noatun-plugins/alarm/kpercentspinbox.h b/noatun-plugins/alarm/kpercentspinbox.h
index 7f1a3a2..3bfe2e7 100644
--- a/noatun-plugins/alarm/kpercentspinbox.h
+++ b/noatun-plugins/alarm/kpercentspinbox.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-			kpercentspinbox.h  -  QSpinbox with %
+			kpercentspinbox.h  -  TQSpinbox with %
                       -------------------
 		begin    : Sun Apr 15 CEST 2001
 		copyright: (C) 2001 by Mickael Marchand <mikmak@freenux.org>
@@ -19,9 +19,10 @@
 
 #include <tqspinbox.h>
 
-class KPercentSpinBox : public QSpinBox
+class KPercentSpinBox : public TQSpinBox
 {
 	Q_OBJECT
+  TQ_OBJECT
 	public:
 		KPercentSpinBox (int _step=1, TQWidget *_parent=0, const char *name=0);
 
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 58c478c..1109b6f 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -104,7 +104,7 @@ void Wakeup::slotCheckTime()
 	TQDate d;
 
 	t=TQTime::currentTime();
-	d=TQDate::currentDate();
+	d=TQDate::tqcurrentDate();
 
 	if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return;
 
@@ -165,11 +165,11 @@ void Wakeup::slotVolumeChange()
 ///////////////////////////////////////////////////////////////////
 // Prefs CModule 
 ///////////////////////////////////////////////////////////////////
-WakeupPrefs::WakeupPrefs( TQObject *parent ) :
-	CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent )
+WakeupPrefs::WakeupPrefs( TQObject *tqparent ) :
+	CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", tqparent )
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQGridLayout *grid = new TQGridLayout (layout,8,4);
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQGridLayout *grid = new TQGridLayout (tqlayout,8,4);
 	
 	monday=new TQCheckBox(i18n("Monday"),this);
 	tuesday=new TQCheckBox(i18n("Tuesday"),this);
@@ -203,38 +203,38 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	TQLabel *selectday = new TQLabel (i18n("Select days:"),this);
 	TQLabel *choosehour = new TQLabel (i18n("Hour"),this);
 	TQLabel *choosemin = new TQLabel (i18n("Minute"),this);
-	grid->addWidget (selectday,0,0,Qt::AlignLeft); 
-	grid->addWidget (choosehour,0,1,Qt::AlignLeft); 
-	grid->addWidget (choosemin,0,2,Qt::AlignLeft); 
+	grid->addWidget (selectday,0,0,TQt::AlignLeft); 
+	grid->addWidget (choosehour,0,1,TQt::AlignLeft); 
+	grid->addWidget (choosemin,0,2,TQt::AlignLeft); 
 
 	applyall = new TQPushButton (this,"applyall");
 	applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) ); 
-	applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, 
+	applyall->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, 
 						TQSizePolicy::Fixed, 
 						applyall->sizePolicy().hasHeightForWidth()) );
-	grid->addWidget (applyall,1,3,Qt::AlignLeft);						
-
-	grid->addWidget (monday,1,0,Qt::AlignLeft);
-	grid->addWidget (tuesday,2,0,Qt::AlignLeft);
-	grid->addWidget (wednesday,3,0,Qt::AlignLeft);
-	grid->addWidget (thursday,4,0,Qt::AlignLeft);
-	grid->addWidget (friday,5,0,Qt::AlignLeft);
-	grid->addWidget (saturday,6,0,Qt::AlignLeft);
-	grid->addWidget (sunday,7,0,Qt::AlignLeft);
-	grid->addWidget (hour1,1,1,Qt::AlignLeft);
-	grid->addWidget (hour2,2,1,Qt::AlignLeft);
-	grid->addWidget (hour3,3,1,Qt::AlignLeft);
-	grid->addWidget (hour4,4,1,Qt::AlignLeft);
-	grid->addWidget (hour5,5,1,Qt::AlignLeft);
-	grid->addWidget (hour6,6,1,Qt::AlignLeft);
-	grid->addWidget (hour7,7,1,Qt::AlignLeft);
-	grid->addWidget (minute1,1,2,Qt::AlignLeft);
-	grid->addWidget (minute2,2,2,Qt::AlignLeft);
-	grid->addWidget (minute3,3,2,Qt::AlignLeft);
-	grid->addWidget (minute4,4,2,Qt::AlignLeft);
-	grid->addWidget (minute5,5,2,Qt::AlignLeft);
-	grid->addWidget (minute6,6,2,Qt::AlignLeft);
-	grid->addWidget (minute7,7,2,Qt::AlignLeft);
+	grid->addWidget (applyall,1,3,TQt::AlignLeft);						
+
+	grid->addWidget (monday,1,0,TQt::AlignLeft);
+	grid->addWidget (tuesday,2,0,TQt::AlignLeft);
+	grid->addWidget (wednesday,3,0,TQt::AlignLeft);
+	grid->addWidget (thursday,4,0,TQt::AlignLeft);
+	grid->addWidget (friday,5,0,TQt::AlignLeft);
+	grid->addWidget (saturday,6,0,TQt::AlignLeft);
+	grid->addWidget (sunday,7,0,TQt::AlignLeft);
+	grid->addWidget (hour1,1,1,TQt::AlignLeft);
+	grid->addWidget (hour2,2,1,TQt::AlignLeft);
+	grid->addWidget (hour3,3,1,TQt::AlignLeft);
+	grid->addWidget (hour4,4,1,TQt::AlignLeft);
+	grid->addWidget (hour5,5,1,TQt::AlignLeft);
+	grid->addWidget (hour6,6,1,TQt::AlignLeft);
+	grid->addWidget (hour7,7,1,TQt::AlignLeft);
+	grid->addWidget (minute1,1,2,TQt::AlignLeft);
+	grid->addWidget (minute2,2,2,TQt::AlignLeft);
+	grid->addWidget (minute3,3,2,TQt::AlignLeft);
+	grid->addWidget (minute4,4,2,TQt::AlignLeft);
+	grid->addWidget (minute5,5,2,TQt::AlignLeft);
+	grid->addWidget (minute6,6,2,TQt::AlignLeft);
+	grid->addWidget (minute7,7,2,TQt::AlignLeft);
 	grid->setColStretch (0,3);
 	
 	TQButtonGroup *modeGroup = new TQButtonGroup (3, Qt::Vertical, i18n ("Volume Control"),this);
@@ -248,9 +248,9 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame);
 	volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue");
 
-	layout->addWidget(modeGroup);
-	layout->addWidget(volFrame);
-	layout->addStretch();
+	tqlayout->addWidget(modeGroup);
+	tqlayout->addWidget(volFrame);
+	tqlayout->addStretch();
 
 	TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); 
 	volLayout->addWidget(volEndLabel);
diff --git a/noatun-plugins/alarm/wakeup.h b/noatun-plugins/alarm/wakeup.h
index e37ff4a..96628dc 100644
--- a/noatun-plugins/alarm/wakeup.h
+++ b/noatun-plugins/alarm/wakeup.h
@@ -32,6 +32,7 @@ class KPercentSpinBox;
 class Wakeup : public TQObject, public Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 	NOATUNPLUGIND
 
 public:
@@ -60,9 +61,10 @@ private:
 class WakeupPrefs : public CModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	WakeupPrefs( TQObject *parent );
+	WakeupPrefs( TQObject *tqparent );
 	virtual void save();
 	virtual void load();
 public slots:
diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui
index 772af81..925a51f 100644
--- a/noatun-plugins/alsaplayer/AlsaPlayer.ui
+++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>APMainWindow</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>APMainWindow</cstring>
     </property>
@@ -18,9 +18,9 @@
     <property name="acceptDrops">
         <bool>true</bool>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
-    <property name="layoutSpacing" stdset="0">
+    <property name="tqlayoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -32,7 +32,7 @@
         <property name="spacing">
             <number>2</number>
         </property>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>Frame3</cstring>
             </property>
@@ -292,9 +292,9 @@
             <property name="frameShadow">
                 <enum>Plain</enum>
             </property>
-            <property name="layoutMargin" stdset="0">
+            <property name="tqlayoutMargin" stdset="0">
             </property>
-            <property name="layoutSpacing" stdset="0">
+            <property name="tqlayoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -306,7 +306,7 @@
                 <property name="spacing">
                     <number>4</number>
                 </property>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>speedLabelLeft</cstring>
                     </property>
@@ -574,13 +574,13 @@
                     <property name="text">
                         <string>Speed:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="3">
+                <widget class="TQLabel" row="1" column="3">
                     <property name="name">
                         <cstring>timeLabel</cstring>
                     </property>
@@ -849,7 +849,7 @@
                         <string>No time data</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="1">
+                <widget class="TQLabel" row="0" column="1">
                     <property name="name">
                         <cstring>speedLabel</cstring>
                     </property>
@@ -1118,7 +1118,7 @@
                         <string>100%</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="2" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>titleLabel</cstring>
                     </property>
@@ -1387,7 +1387,7 @@
                         <string>No stream</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>volumeLabel</cstring>
                     </property>
@@ -1656,7 +1656,7 @@
                         <string>100%</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>volumeLabelLeft</cstring>
                     </property>
@@ -1924,13 +1924,13 @@
                     <property name="text">
                         <string>Volume:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="2">
+                <widget class="TQLabel" row="1" column="2">
                     <property name="name">
                         <cstring>infoLabel</cstring>
                     </property>
@@ -2205,18 +2205,18 @@
             <property name="name">
                 <cstring>seeker</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>32</width>
                     <height>16</height>
                 </size>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout10</cstring>
             </property>
-            <property name="layoutSpacing" stdset="0">
+            <property name="tqlayoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -2228,11 +2228,11 @@
                 <property name="spacing">
                     <number>4</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout9</cstring>
                     </property>
-                    <property name="layoutSpacing" stdset="0">
+                    <property name="tqlayoutSpacing" stdset="0">
                     </property>
                     <vbox>
                         <property name="name">
@@ -2254,18 +2254,18 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout8</cstring>
                             </property>
-                            <property name="layoutSpacing" stdset="0">
+                            <property name="tqlayoutSpacing" stdset="0">
                             </property>
                             <hbox>
                                 <property name="name">
@@ -2277,7 +2277,7 @@
                                 <property name="spacing">
                                     <number>2</number>
                                 </property>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>menuButton</cstring>
                                     </property>
@@ -2297,7 +2297,7 @@
                                         <string>Menu</string>
                                     </property>
                                 </widget>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>previousButton</cstring>
                                     </property>
@@ -2314,7 +2314,7 @@
                                         <string>Skip to previous track</string>
                                     </property>
                                 </widget>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>playButton</cstring>
                                     </property>
@@ -2331,7 +2331,7 @@
                                         <string>Play</string>
                                     </property>
                                 </widget>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>nextButton</cstring>
                                     </property>
@@ -2348,7 +2348,7 @@
                                         <string>Skip to next track</string>
                                     </property>
                                 </widget>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>stopButton</cstring>
                                     </property>
@@ -2365,7 +2365,7 @@
                                         <string>Stop</string>
                                     </property>
                                 </widget>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>playlistButton</cstring>
                                     </property>
@@ -2394,7 +2394,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -2403,11 +2403,11 @@
                         </spacer>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
-                    <property name="layoutSpacing" stdset="0">
+                    <property name="tqlayoutSpacing" stdset="0">
                     </property>
                     <vbox>
                         <property name="name">
@@ -2419,11 +2419,11 @@
                         <property name="spacing">
                             <number>2</number>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout3</cstring>
                             </property>
-                            <property name="layoutSpacing" stdset="0">
+                            <property name="tqlayoutSpacing" stdset="0">
                             </property>
                             <hbox>
                                 <property name="name">
@@ -2435,7 +2435,7 @@
                                 <property name="spacing">
                                     <number>2</number>
                                 </property>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>pauseButton</cstring>
                                     </property>
@@ -2455,7 +2455,7 @@
                                         <string>Pause</string>
                                     </property>
                                 </widget>
-                                <widget class="QToolButton">
+                                <widget class="TQToolButton">
                                     <property name="name">
                                         <cstring>forwardButton</cstring>
                                     </property>
@@ -2475,7 +2475,7 @@
                                         <string>Forwards, normal speed</string>
                                     </property>
                                 </widget>
-                                <widget class="QSlider">
+                                <widget class="TQSlider">
                                     <property name="name">
                                         <cstring>speedSlider</cstring>
                                     </property>
@@ -2497,11 +2497,11 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout4</cstring>
                             </property>
-                            <property name="layoutSpacing" stdset="0">
+                            <property name="tqlayoutSpacing" stdset="0">
                             </property>
                             <hbox>
                                 <property name="name">
@@ -2513,7 +2513,7 @@
                                 <property name="spacing">
                                     <number>2</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>PixmapLabel2</cstring>
                                     </property>
@@ -2530,7 +2530,7 @@
                                         <string>Balance</string>
                                     </property>
                                 </widget>
-                                <widget class="QSlider">
+                                <widget class="TQSlider">
                                     <property name="name">
                                         <cstring>balanceSlider</cstring>
                                     </property>
@@ -2547,7 +2547,7 @@
                                         <string>Balance</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>PixmapLabel1</cstring>
                                     </property>
@@ -2561,7 +2561,7 @@
                                         <string>Volume</string>
                                     </property>
                                 </widget>
-                                <widget class="QSlider">
+                                <widget class="TQSlider">
                                     <property name="name">
                                         <cstring>volumeSlider</cstring>
                                     </property>
@@ -2636,5 +2636,5 @@
         <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
     </image>
 </images>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/noatun-plugins/alsaplayer/Makefile.am b/noatun-plugins/alsaplayer/Makefile.am
index 3b149f6..ce584a8 100644
--- a/noatun-plugins/alsaplayer/Makefile.am
+++ b/noatun-plugins/alsaplayer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(kde_includes)/kde  -I$(kde_includes)/arts
 
 kde_module_LTLIBRARIES = noatunalsaplayer.la
 
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 6fd02f8..339b484 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -29,23 +29,23 @@
 
 #include "configmodule.h"
 
-AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
+AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * tqparent)
   :
   CModule
   (
    i18n("AlsaPlayer"),
    i18n("AlsaPlayer Interface Settings"),
    "appearance",
-   parent
+   tqparent
   )
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * layout = new TQVBoxLayout(this);
+  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
 
-  layout->addWidget(scroll_);
+  tqlayout->addWidget(scroll_);
 
-	layout->addStretch(100);
+	tqlayout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/alsaplayer/configmodule.h b/noatun-plugins/alsaplayer/configmodule.h
index 004ec79..e804cc1 100644
--- a/noatun-plugins/alsaplayer/configmodule.h
+++ b/noatun-plugins/alsaplayer/configmodule.h
@@ -30,6 +30,7 @@ class TQCheckBox;
 class AlsaPlayerConfigModule : public CModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
diff --git a/noatun-plugins/alsaplayer/seeker.cpp b/noatun-plugins/alsaplayer/seeker.cpp
index 606b461..e3c12c1 100644
--- a/noatun-plugins/alsaplayer/seeker.cpp
+++ b/noatun-plugins/alsaplayer/seeker.cpp
@@ -26,8 +26,8 @@
 #include <noatun/player.h>
 #include "seeker.h"
 
-Seeker::Seeker(TQWidget * parent, const char * name)
-	: L33tSlider(0, 1000, 10, 0, Horizontal, parent, name)
+Seeker::Seeker(TQWidget * tqparent, const char * name)
+	: L33tSlider(0, 1000, 10, 0,Qt::Horizontal, tqparent, name)
 {
 	connect(this, TQT_SIGNAL(userChanged(int)),		TQT_SLOT(slotValueChanged(int)));
 
diff --git a/noatun-plugins/alsaplayer/seeker.h b/noatun-plugins/alsaplayer/seeker.h
index d17a760..9eb67ed 100644
--- a/noatun-plugins/alsaplayer/seeker.h
+++ b/noatun-plugins/alsaplayer/seeker.h
@@ -28,10 +28,11 @@
 class Seeker : public L33tSlider
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
-		Seeker(TQWidget * parent, const char * name = 0);
+		Seeker(TQWidget * tqparent, const char * name = 0);
 		virtual ~Seeker();
 
 	protected slots:
diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp
index f329c4f..cc53b06 100644
--- a/noatun-plugins/alsaplayer/userinterface.cpp
+++ b/noatun-plugins/alsaplayer/userinterface.cpp
@@ -118,7 +118,7 @@ AlsaPlayer::AlsaPlayer()
 
 	connect
 		(
-		 new AlsaPlayerConfigModule(this),
+		 new AlsaPlayerConfigModule(TQT_TQOBJECT(this)),
 		 TQT_SIGNAL(saved()),
 		 TQT_SLOT(slotConfigChanged())
 		);
@@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer()
 
 	loadConfig();
 
-	resize(sizeHint().width(), minimumSizeHint().height());
+	resize(tqsizeHint().width(), tqminimumSizeHint().height());
 
 	show();
 }
@@ -196,7 +196,7 @@ void AlsaPlayer::setTitleText(const TQString & s)
 
 void AlsaPlayer::slotPlaying()
 {
-	setTitleText(TQString::null);
+	setTitleText(TQString());
 
 	playButton->setOn(true);
 	stopButton->setEnabled(true);
@@ -212,7 +212,7 @@ void AlsaPlayer::slotStopped()
 
 void AlsaPlayer::slotPaused()
 {
-	setTitleText(TQString::null);
+	setTitleText(TQString());
 
 	stopButton->setEnabled(true);
 	playButton->setOn(false);
@@ -223,11 +223,11 @@ bool AlsaPlayer::eventFilter(TQObject *o, TQEvent *e)
 	switch (e->type())
 	{
 		case TQEvent::MouseButtonPress:
-			mousePressEvent(static_cast<TQMouseEvent *>(e));
+			mousePressEvent(TQT_TQMOUSEEVENT(e));
 			break;
 
 		case TQEvent::Wheel:
-			wheelEvent(static_cast<TQWheelEvent*>(e));
+			wheelEvent(TQT_TQWHEELEVENT(e));
 			return true;
 			break;
 
@@ -250,7 +250,7 @@ void AlsaPlayer::slotPlayListHidden()
 
 void AlsaPlayer::mousePressEvent(TQMouseEvent * e)
 {
-	if (e->button() == RightButton)
+	if (e->button() == Qt::RightButton)
 	{
 		NoatunStdAction::ContextMenu::showContextMenu();
 		return;
@@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged()
 void AlsaPlayer::slotVolumeChanged(int i)
 {
 	TQString text("%1%");
-	volumeLabel->setText(text.arg(i));
+	volumeLabel->setText(text.tqarg(i));
 	volumeSlider->setValue(i);
 }
 
@@ -284,7 +284,7 @@ void AlsaPlayer::slotTimeout()
 	if (!napp->player()->current())
 		return;
 
-	setTitleText(TQString::null);
+	setTitleText(TQString());
 
 	TQString lengthText(napp->player()->lengthString());
 
@@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed)
 	speed_ = newSpeed;
 
 	pauseButton->setEnabled(0 != speed_);
-	speedLabel->setText(TQString("%1%").arg(speed_));
+	speedLabel->setText(TQString("%1%").tqarg(speed_));
 
 	Arts::PlayObject playobject(napp->player()->engine()->playObject());
 	Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject);
diff --git a/noatun-plugins/alsaplayer/userinterface.h b/noatun-plugins/alsaplayer/userinterface.h
index 210f16b..abec7fd 100644
--- a/noatun-plugins/alsaplayer/userinterface.h
+++ b/noatun-plugins/alsaplayer/userinterface.h
@@ -37,6 +37,7 @@ class Seeker;
 class AlsaPlayer : public APMainWindow, public UserInterface
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
diff --git a/noatun-plugins/blurscope/Makefile.am b/noatun-plugins/blurscope/Makefile.am
index 6ac86b3..a09d5e7 100644
--- a/noatun-plugins/blurscope/Makefile.am
+++ b/noatun-plugins/blurscope/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = noatunblurscope.la
 noatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp
diff --git a/noatun-plugins/blurscope/scopedisplayer.cpp b/noatun-plugins/blurscope/scopedisplayer.cpp
index 42b375a..6b10732 100644
--- a/noatun-plugins/blurscope/scopedisplayer.cpp
+++ b/noatun-plugins/blurscope/scopedisplayer.cpp
@@ -130,7 +130,7 @@ SDLView::SDLView(int in) : mFd(in), outputBmp(0), fullscreen(false)
 			d++;
 			x++;
 		}
-		repaint();
+		tqrepaint();
 	}
 }
 
@@ -233,7 +233,7 @@ void SDLView::checkInput()
 
 #define output2 ((unsigned char*)outputBmp.data)
 
-void SDLView::repaint()
+void SDLView::tqrepaint()
 {
 	SDL_LockSurface(surface);
 	TEST();
diff --git a/noatun-plugins/blurscope/sdlscope.h b/noatun-plugins/blurscope/sdlscope.h
index 45c734c..73e6d6d 100644
--- a/noatun-plugins/blurscope/sdlscope.h
+++ b/noatun-plugins/blurscope/sdlscope.h
@@ -94,7 +94,7 @@ protected:
 	void checkInput();
 	void setupPalette(double dummy=0.0);
 
-	void repaint();
+	void tqrepaint();
 
 private:
 	int mFd;
diff --git a/noatun-plugins/charlatan/Makefile.am b/noatun-plugins/charlatan/Makefile.am
index 0603703..3643ec6 100644
--- a/noatun-plugins/charlatan/Makefile.am
+++ b/noatun-plugins/charlatan/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = noatuncharlatan.la
 
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 3624e0b..4d8f157 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -29,23 +29,23 @@
 
 #include "configmodule.h"
 #include "configmodule.moc"
-CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
+CharlatanConfigModule::CharlatanConfigModule(TQObject * tqparent)
   :
   CModule
   (
    i18n("Charlatan"),
    i18n("Charlatan Interface Settings"),
    "appearance",
-   parent
+   tqparent
   )
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * layout = new TQVBoxLayout(this);
+  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
 
-  layout->addWidget(scroll_);
+  tqlayout->addWidget(scroll_);
 
-	layout->addStretch(100);
+	tqlayout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/charlatan/configmodule.h b/noatun-plugins/charlatan/configmodule.h
index d0646c2..d41df89 100644
--- a/noatun-plugins/charlatan/configmodule.h
+++ b/noatun-plugins/charlatan/configmodule.h
@@ -30,6 +30,7 @@ class TQCheckBox;
 class CharlatanConfigModule : public CModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
diff --git a/noatun-plugins/charlatan/seeker.cpp b/noatun-plugins/charlatan/seeker.cpp
index c5ca084..fc55f36 100644
--- a/noatun-plugins/charlatan/seeker.cpp
+++ b/noatun-plugins/charlatan/seeker.cpp
@@ -27,8 +27,8 @@
 #include "seeker.h"
 #include "seeker.moc"
 
-Seeker::Seeker(TQWidget * parent)
-	: TQSlider(0, 60, 10, 0, Horizontal, parent),
+Seeker::Seeker(TQWidget * tqparent)
+	: TQSlider(0, 60, 10, 0,Qt::Horizontal, tqparent),
 		adjusting_(false)
 {
 	delayedUpdateTimer_ = new TQTimer(this);
diff --git a/noatun-plugins/charlatan/seeker.h b/noatun-plugins/charlatan/seeker.h
index 922f902..98b071a 100644
--- a/noatun-plugins/charlatan/seeker.h
+++ b/noatun-plugins/charlatan/seeker.h
@@ -27,13 +27,14 @@
 
 class TQTimer;
 
-class Seeker : public QSlider
+class Seeker : public TQSlider
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
-		Seeker(TQWidget * parent);
+		Seeker(TQWidget * tqparent);
 		virtual ~Seeker();
 
 	protected slots:
@@ -51,7 +52,7 @@ class Seeker : public QSlider
 	private:
 
 		bool			adjusting_;
-		QTimer	* delayedUpdateTimer_;
+		TQTimer	* delayedUpdateTimer_;
 };
 
 #endif
diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp
index b9bb4c1..8e67516 100644
--- a/noatun-plugins/charlatan/userinterface.cpp
+++ b/noatun-plugins/charlatan/userinterface.cpp
@@ -48,7 +48,7 @@
 #include "seeker.h"
 
 Charlatan::Charlatan()
-	: QWidget									(0, "Charlatan"),
+	: TQWidget									(0, "Charlatan"),
 		UserInterface						(),
 		previousButton_					(0L),
 		stopButton_							(0L),
@@ -189,7 +189,7 @@ Charlatan::Charlatan()
 
 	connect
 		(
-		 new CharlatanConfigModule(this),
+		 new CharlatanConfigModule(TQT_TQOBJECT(this)),
 		 TQT_SIGNAL(saved()),
 		 TQT_SLOT(slotConfigChanged())
 		);
@@ -321,7 +321,7 @@ bool Charlatan::eventFilter(TQObject *o, TQEvent *e)
 	switch (e->type())
 	{
 		case TQEvent::Wheel:
-			wheelEvent(static_cast<TQWheelEvent*>(e));
+			wheelEvent(TQT_TQWHEELEVENT(e));
 			return true;
 			break;
 
@@ -344,7 +344,7 @@ void Charlatan::slotPlayListHidden()
 
 void Charlatan::mousePressEvent(TQMouseEvent * e)
 {
-	if (e->button() == RightButton)
+	if (e->button() == Qt::RightButton)
 	{
 		NoatunStdAction::ContextMenu::showContextMenu();
 		return;
@@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged()
 
 void Charlatan::slotVolumeChanged(int i)
 {
-	TQString message(i18n("Volume: %1").arg(i));
+	TQString message(i18n("Volume: %1").tqarg(i));
 
 	showingVolumeTimer_->start(2000, true);
 	titleLabel_->setText(message);
diff --git a/noatun-plugins/charlatan/userinterface.h b/noatun-plugins/charlatan/userinterface.h
index 7d74e39..3e40487 100644
--- a/noatun-plugins/charlatan/userinterface.h
+++ b/noatun-plugins/charlatan/userinterface.h
@@ -38,6 +38,7 @@ class TQLabel;
 class Charlatan : public TQWidget, public UserInterface
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
 
@@ -73,7 +74,7 @@ class Charlatan : public TQWidget, public UserInterface
 		virtual void closeEvent				(TQCloseEvent *);
 		virtual bool eventFilter			(TQObject *, TQEvent *);
 		virtual void wheelEvent				(TQWheelEvent *);
-		virtual void setTitleText			(const TQString & = TQString::null);
+		virtual void setTitleText			(const TQString & = TQString());
 
 		void loadConfig();
 
@@ -89,10 +90,10 @@ class Charlatan : public TQWidget, public UserInterface
 		Seeker					* seekSlider_;
 		ScrollingLabel	* titleLabel_;
 
-		QLabel					* positionLabel_;
+		TQLabel					* positionLabel_;
 
-		QTimer					* showingVolumeTimer_;
-		QString						title_;
+		TQTimer					* showingVolumeTimer_;
+		TQString						title_;
 };
 
 #endif
diff --git a/noatun-plugins/dub/dub/Makefile.am b/noatun-plugins/dub/dub/Makefile.am
index f49684c..6628217 100644
--- a/noatun-plugins/dub/dub/Makefile.am
+++ b/noatun-plugins/dub/dub/Makefile.am
@@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = noatundub.la
 
-INCLUDES = $(all_includes)
+INCLUDES = $(all_includes) -I$(kde_includes)/kde
 
 noatundub_la_SOURCES = dubprefs.ui dubplaylistitem.cpp dubplaylist.cpp \
 fileselectorwidget.cpp dubview.cpp dubapp.cpp dub.cpp dubconfigmodule.cpp
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 5de4104..e6b6c81 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -174,7 +174,7 @@ KFileItem* Dub::Linear_Seq::last(TQPtrList<KFileItem> & items)
   return lastFile;
 }
 
-bool Dub::Linear_Seq::find(TQPtrList<KFileItem> & items, KFileItem* a_file)
+bool Dub::Linear_Seq::tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file)
 {
   // find file
    for (KFileItem *file=items.first(); file; file=items.next() )
@@ -192,7 +192,7 @@ KFileItem* Dub::Linear_Seq::next(TQPtrList<KFileItem> & items,
   assert(active_file);
   bool found = false;
   if (*active_file) {
-    if (find(items, *active_file)) {
+    if (tqfind(items, *active_file)) {
       KFileItem* next = items.next();
       for (; next && !next->isFile(); next = items.next()) ; // find next file
       if (next && next->isFile())
@@ -219,7 +219,7 @@ KFileItem* Dub::Linear_Seq::prev(TQPtrList<KFileItem> & items,
   bool found = false;
   if (*active_file) {
     // locate current item
-    if (find(items, *active_file)) {
+    if (tqfind(items, *active_file)) {
       KFileItem* prev = items.prev();
       for (; prev && !prev->isFile(); prev = items.prev()) ; // find prev file
       if (prev && prev->isFile()) {
@@ -245,7 +245,7 @@ KFileItem* Dub::Linear_OneDir::first()
   if (first)
     set_file(&first_file, first);
   else {
-    if (first_file) {		// invalidate first
+    if (first_file) {		// tqinvalidate first
       delete first_file;
       first_file = 0;
     }
@@ -281,8 +281,8 @@ Dub::Dir_Node::Dir_Node(TQString d, bool forward)
   // process entry list, form a list of subdirs and normal files
   file_items.setAutoDelete(true);
   TQDir dir_obj(dir);
-  QFileInfoList* entries =
-    const_cast<QFileInfoList*>(dir_obj.entryInfoList());
+  TQFileInfoList* entries =
+    const_cast<TQFileInfoList*>(dir_obj.entryInfoList());
   for ( TQFileInfo *file = entries->first(); file; file = entries->next() ) {
     if (file->isDir() && file->absFilePath().length()>d.length()) {
       kdDebug(90010) << "dub: dir " << file->absFilePath() << endl;
@@ -451,7 +451,7 @@ void Dub::Recursive_Seq::prev_preorder()
   }
   else {
     TQString subdir = *top->current_subdir;
-    kdDebug(90010) << "we have children, pushing now " << subdir << endl;
+    kdDebug(90010) << "we have tqchildren, pushing now " << subdir << endl;
     push_dir(subdir, false); // push directory w/ backward iterators
   }
 }
diff --git a/noatun-plugins/dub/dub/dub.h b/noatun-plugins/dub/dub/dub.h
index da220e8..a114248 100644
--- a/noatun-plugins/dub/dub/dub.h
+++ b/noatun-plugins/dub/dub/dub.h
@@ -47,6 +47,7 @@ class DubPlaylist;
 class Dub : public DubApp
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -110,7 +111,7 @@ private:
     KFileItem* last(TQPtrList<KFileItem> & items);
     KFileItem* next(TQPtrList<KFileItem> & items, KFileItem** active_file);
     KFileItem* prev(TQPtrList<KFileItem> & items, KFileItem** active_file);
-    bool find(TQPtrList<KFileItem> & items, KFileItem* a_file);
+    bool tqfind(TQPtrList<KFileItem> & items, KFileItem* a_file);
   };
 
   // sequencer that traverses current directory in view order
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 4908382..2647203 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -34,8 +34,8 @@
 
 #define ID_STATUS_MSG 1
 
-DubApp::DubApp(TQWidget* parent, const char* name)
-  : KMainWindow(parent, name)
+DubApp::DubApp(TQWidget* tqparent, const char* name)
+  : KMainWindow(tqparent, name)
 {
   kdDebug(90010) << "cons dubapp" << endl;
   config=kapp->config();
@@ -54,7 +54,7 @@ DubApp::~DubApp()
 
 void DubApp::initActions()
 {
-  fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection());
+  fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
   setStandardToolBarMenuEnabled(true);
   createStandardStatusBarAction();
 
diff --git a/noatun-plugins/dub/dub/dubapp.h b/noatun-plugins/dub/dub/dubapp.h
index 014d176..9b4f4b7 100644
--- a/noatun-plugins/dub/dub/dubapp.h
+++ b/noatun-plugins/dub/dub/dubapp.h
@@ -31,13 +31,14 @@ class DubView;
 class DubApp : public KMainWindow
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class DubView;
 
 public:
   /** construtor of DubApp, calls all init functions to create the application.
    */
-  DubApp(TQWidget* parent, const char* name="Dub Playlist");
+  DubApp(TQWidget* tqparent, const char* name="Dub Playlist");
   ~DubApp();
 
   void initActions();
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 581bbf2..b227016 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -25,8 +25,8 @@
 
 #include "dubconfigmodule.h"
 
-DubConfigModule::DubConfigModule(TQObject* parent)
-  : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", parent)
+DubConfigModule::DubConfigModule(TQObject* tqparent)
+  : CModule(i18n("Dub"), i18n("Folder-Based Playlist"), "noatun", tqparent)
     , playMode(oneDir)
     , playOrder(normal)
 {
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.h b/noatun-plugins/dub/dub/dubconfigmodule.h
index 1793017..d2545cd 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.h
+++ b/noatun-plugins/dub/dub/dubconfigmodule.h
@@ -14,11 +14,12 @@
 class DubConfigModule : public CModule
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   enum PlayOrder { normal, shuffle, repeat, single };
   enum PlayMode { allFiles, oneDir, recursiveDir };
 
-  DubConfigModule(TQObject *parent);
+  DubConfigModule(TQObject *tqparent);
 
   ~DubConfigModule();
 
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp
index 62d2e5c..db7a2f2 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.cpp
+++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp
@@ -40,8 +40,8 @@ DubPlaylistItem::~DubPlaylistItem(){
 TQString DubPlaylistItem::property(const TQString &key, const TQString &def) const {
 //   kdDebug(90010) << "property " << key << endl;
   if (isProperty(key)) {
-    kdDebug(90010) << key << " -> " << property_map.find(key).data() << endl;
-    return property_map.find(key).data();
+    kdDebug(90010) << key << " -> " << property_map.tqfind(key).data() << endl;
+    return property_map.tqfind(key).data();
   }
   else
     return def;
@@ -69,7 +69,7 @@ TQStringList DubPlaylistItem::properties() const {
 
 bool DubPlaylistItem::isProperty(const TQString &key) const {
 //   kdDebug(90010) << "is property? " << key << endl;
-  return (property_map.find(key) != property_map.end());
+  return (property_map.tqfind(key) != property_map.end());
 }
 
 KURL DubPlaylistItem::url() const {
diff --git a/noatun-plugins/dub/dub/dubprefs.ui b/noatun-plugins/dub/dub/dubprefs.ui
index 6b27195..c403ae0 100644
--- a/noatun-plugins/dub/dub/dubprefs.ui
+++ b/noatun-plugins/dub/dub/dubprefs.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>DubPrefs</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DubPrefs</cstring>
     </property>
@@ -27,15 +27,15 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -61,7 +61,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>playMode</cstring>
             </property>
@@ -72,7 +72,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>allFiles</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <string>All media files found under Media Home</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>oneDir</cstring>
                     </property>
@@ -94,7 +94,7 @@
                         <string>Play current folder only</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>recursiveDir</cstring>
                     </property>
@@ -110,7 +110,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>playOrder</cstring>
             </property>
@@ -121,7 +121,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>normal</cstring>
                     </property>
@@ -132,7 +132,7 @@
                         <string>Play files in normal order</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>shuffle</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         <string>Randomized order</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>repeat</cstring>
                     </property>
@@ -160,7 +160,7 @@
                         <string>Repeat the same file forever</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>single</cstring>
                     </property>
@@ -178,7 +178,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/noatun-plugins/dub/dub/dubview.cpp b/noatun-plugins/dub/dub/dubview.cpp
index 087e92e..1522918 100644
--- a/noatun-plugins/dub/dub/dubview.cpp
+++ b/noatun-plugins/dub/dub/dubview.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-// include files for Qt
+// include files for TQt
 #include <tqprinter.h>
 #include <tqpainter.h>
 #include <kdebug.h>
@@ -26,12 +26,12 @@
 #include "dub.h"
 #include "fileselectorwidget.h"
 
-//DubView::DubView(TQWidget *parent, const char *name) : TQWidget(parent, name)
+//DubView::DubView(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 //{
 //  setBackgroundMode(PaletteBase);
 //}
 
-DubView::DubView(TQWidget *parent) : FileSelectorWidget(parent)
+DubView::DubView(TQWidget *tqparent) : FileSelectorWidget(tqparent)
 {
   kdDebug(90010) << "dub view cons" << endl;
   setBackgroundMode(PaletteBase);
diff --git a/noatun-plugins/dub/dub/dubview.h b/noatun-plugins/dub/dub/dubview.h
index 079b833..a83d7cb 100644
--- a/noatun-plugins/dub/dub/dubview.h
+++ b/noatun-plugins/dub/dub/dubview.h
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-// include files for Qt
+// include files for TQt
 #include <tqwidget.h>
 
 #include <fileselectorwidget.h>
@@ -31,9 +31,10 @@
 class DubView : public FileSelectorWidget
 {
  Q_OBJECT
+  TQ_OBJECT
  public:
  /** Constructor for the main view */
- DubView(TQWidget *parent = 0);
+ DubView(TQWidget *tqparent = 0);
  /** Destructor for the main view */
  ~DubView();
 
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index c030040..f809629 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -36,11 +36,11 @@
 #include "fileselectorwidget.h"
 
 
-FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
-    : TQWidget(parent, "file selector widget")
+FileSelectorWidget::FileSelectorWidget(TQWidget *tqparent)
+    : TQWidget(tqparent, "file selector widget")
 {
 
-	// widgets and layout
+	// widgets and tqlayout
 
 	TQVBoxLayout* lo = new TQVBoxLayout(this);
 
@@ -66,12 +66,12 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
 	hlow->setMaximumHeight(up->height());
 
 	cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-	cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+	cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 	KURLCompletion* cmpl = new KURLCompletion();
 	cmbPath->setCompletionObject( cmpl );
 	lo->addWidget(cmbPath);
 
-	dir = new KDirOperator(TQString::null, this, "operator");
+	dir = new KDirOperator(TQString(), this, "operator");
 	dir->setView(KFile::Detail);
 	lo->addWidget(dir);
 	lo->setStretchFactor(dir, 2);
@@ -80,7 +80,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
 	filterIcon = new TQLabel(filterBox);
 	filterIcon->setPixmap( BarIcon("filter") );
 	filter = new KHistoryCombo(filterBox, "filter");
-	filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+	filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
 	filterBox->setStretchFactor(filter, 2);
 	lo->addWidget(filterBox);
 
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index e31b721..516e3ce 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -31,14 +31,15 @@
 
 class DubPlayListItem;
 
-class FileSelectorWidget : public QWidget
+class FileSelectorWidget : public TQWidget
 {
   Q_OBJECT
+  TQ_OBJECT
 
   friend class DubPlayListItem;
 
 public:
-  FileSelectorWidget(TQWidget *parent);
+  FileSelectorWidget(TQWidget *tqparent);
   ~FileSelectorWidget();
 
   KDirOperator* dirOperator() {return dir;}
diff --git a/noatun-plugins/ffrs/Makefile.am b/noatun-plugins/ffrs/Makefile.am
index 96eae2d..1ecfd53 100644
--- a/noatun-plugins/ffrs/Makefile.am
+++ b/noatun-plugins/ffrs/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(kde_includes)/arts $(all_includes)
+INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde
 kde_module_LTLIBRARIES = noatun_ffrs.la
 
 noatun_ffrs_la_SOURCES = ffrs.cpp
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 38fd56e..73f2685 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -22,7 +22,7 @@ extern "C" Plugin *create_plugin()
 
 
 View::View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel)
-	: TQWidget(0,0, Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WType_TopLevel), mChannel(channel)
+	: TQWidget(0,0, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WType_TopLevel), mChannel(channel)
 {
 	fg = front;
 	bg = back;
@@ -52,26 +52,26 @@ View::View(int width, int height, int block, int unblock, TQColor front, TQColor
 
 	// make sure we're on the desktop
 	if (
-			!desktop.contains(rect().topLeft())
-			 || !desktop.contains(rect().bottomRight())
+			!desktop.tqcontains(rect().topLeft())
+			 || !desktop.tqcontains(rect().bottomRight())
 		)
 	{
 		move(at);
 	}
 
 
-	TQBitmap mask(width, height);
-	TQPainter p(&mask);
+	TQBitmap tqmask(width, height);
+	TQPainter p(&tqmask);
 
-//	Qt::color0 = transparent
-//	Qt::color1 = opaque
-	p.fillRect(0, 0, width, height, Qt::color0);
+//	TQt::color0 = transparent
+//	TQt::color1 = opaque
+	p.fillRect(0, 0, width, height, TQt::color0);
 	for (int i=0; i < height; )
 	{
-		p.fillRect(0, height-i-block, width, block, Qt::color1);
+		p.fillRect(0, height-i-block, width, block, TQt::color1);
 		i += block + unblock;
 	}
-	setMask(mask);
+	setMask(tqmask);
 	units = block+unblock;
 	show();
 
@@ -184,52 +184,52 @@ void FFRS::changed()
 #include <tqhbox.h>
 #include <tqlabel.h>
 
-FFRSPrefs::FFRSPrefs( TQObject *parent )
-	: CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent)
+FFRSPrefs::FFRSPrefs( TQObject *tqparent )
+	: CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",tqparent)
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this);
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
 
 	TQHBox *box = new TQHBox(this);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	new TQLabel(i18n("Width:"), box);
 	mWidth = new KIntNumInput(width(), box);
 	mWidth->setMinValue(0);
 
 	box = new TQHBox(this);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	new TQLabel(i18n("Height:"), box);
 	mHeight = new KIntNumInput(height(), box);
 	mHeight->setMinValue(0);
 
 	box = new TQHBox(this);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	new TQLabel(i18n("Visible block size:"), box);
 	mFgblock = new KIntNumInput(fgblock(), box);
 	mFgblock->setMinValue(0);
 
 	box = new TQHBox(this);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	new TQLabel(i18n("Transparent block size:"), box);
 	mBgblock = new KIntNumInput(bgblock(), box);
 	mBgblock->setMinValue(0);
 
 	box = new TQHBox(this);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	new TQLabel(i18n("Update interval:"), box);
 	mRate = new KIntNumInput(rate(), box);
 	mRate->setMinValue(0);
 
 	box = new TQHBox(this);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	new TQLabel(i18n("Foreground color:"), box);
 	mFgcolor = new KColorButton(fgcolor(), box);
 
 	box = new TQHBox(this);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 	new TQLabel(i18n("Background color:"), box);
 	mBgcolor = new KColorButton(bgcolor(), box);
 
-	layout->addStretch();
+	tqlayout->addStretch();
 }
 
 void FFRSPrefs::save()
diff --git a/noatun-plugins/ffrs/ffrs.h b/noatun-plugins/ffrs/ffrs.h
index a29a1c2..c19e86c 100644
--- a/noatun-plugins/ffrs/ffrs.h
+++ b/noatun-plugins/ffrs/ffrs.h
@@ -5,9 +5,10 @@
 #include <noatun/plugin.h>
 
 
-class View : public QWidget
+class View : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	View(int width, int height, int block, int unblock, TQColor front, TQColor back, int channel);
 	~View();
@@ -31,6 +32,7 @@ class FFRSPrefs;
 class FFRS : public TQObject, public Plugin, public StereoScope
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	FFRS();
@@ -53,9 +55,10 @@ class KColorButton;
 class FFRSPrefs : public CModule
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	FFRSPrefs( TQObject *parent );
+	FFRSPrefs( TQObject *tqparent );
 	virtual void save();
 
 	int width();
diff --git a/noatun-plugins/luckytag/Makefile.am b/noatun-plugins/luckytag/Makefile.am
index 4e02899..ae0c8e1 100644
--- a/noatun-plugins/luckytag/Makefile.am
+++ b/noatun-plugins/luckytag/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(kde_includes)/kde
 kde_module_LTLIBRARIES = noatunluckytag.la
 
 noatunluckytag_la_SOURCES = luckytag.cpp parsedmp3filename.cpp
diff --git a/noatun-plugins/luckytag/parsedmp3filename.cpp b/noatun-plugins/luckytag/parsedmp3filename.cpp
index 1c75958..11694bc 100644
--- a/noatun-plugins/luckytag/parsedmp3filename.cpp
+++ b/noatun-plugins/luckytag/parsedmp3filename.cpp
@@ -31,22 +31,22 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path)
 	TQString fileName = url.fileName(false);
 	m_directories = TQStringList::split("/", url.directory());
 	
-	if (fileName.startsWith("(") && fileName.contains(")"))
+	if (fileName.startsWith("(") && fileName.tqcontains(")"))
 	{
-		m_artist = fileName.mid(1, fileName.find(")") - 1);
-		m_title = fileName.right(fileName.length() - fileName.find(")") - 1);
+		m_artist = fileName.mid(1, fileName.tqfind(")") - 1);
+		m_title = fileName.right(fileName.length() - fileName.tqfind(")") - 1);
 		validateArtist();
 	}
-	else if (fileName.startsWith("[") && fileName.contains("]"))
+	else if (fileName.startsWith("[") && fileName.tqcontains("]"))
 	{
-		m_artist = fileName.mid(1, fileName.find("]") - 1);
-		m_title = fileName.right(fileName.length() - fileName.find("]") - 1);
+		m_artist = fileName.mid(1, fileName.tqfind("]") - 1);
+		m_title = fileName.right(fileName.length() - fileName.tqfind("]") - 1);
 		validateArtist();
 	}
-	else if (fileName.contains("-"))
+	else if (fileName.tqcontains("-"))
 	{
-		m_artist = fileName.left(fileName.find("-") - 1);
-		m_title = fileName.right(fileName.length() - fileName.find("-") - 1);
+		m_artist = fileName.left(fileName.tqfind("-") - 1);
+		m_title = fileName.right(fileName.length() - fileName.tqfind("-") - 1);
 		validateArtist();
 	}
 	else
@@ -56,10 +56,10 @@ ParsedMP3FileName::ParsedMP3FileName(const TQString &path)
 		m_artist = m_directories[m_directories.count() - 2];
 	}
 		
-	if (m_title.contains("(") && m_title.find(")", m_title.find("(")))
+	if (m_title.tqcontains("(") && m_title.tqfind(")", m_title.tqfind("(")))
 	{
-		unsigned int start = m_title.find("(");
-		unsigned int end = m_title.find(")");
+		unsigned int start = m_title.tqfind("(");
+		unsigned int end = m_title.tqfind(")");
 		m_comment = m_title.mid(start + 1, end - start - 1);
 		m_title.truncate(start);
 	}
@@ -86,10 +86,10 @@ TQString ParsedMP3FileName::beautifyString(const TQString &s)
 	
 	temp[0] = temp[0].upper();
 	
-	unsigned int numSpaces = temp.contains(" ");
+	unsigned int numSpaces = temp.tqcontains(" ");
 	unsigned int spacePos = 0;
 	while (numSpaces > 0) {
-		spacePos = temp.find(" ", spacePos == 0? 0 : spacePos + 1);
+		spacePos = temp.tqfind(" ", spacePos == 0? 0 : spacePos + 1);
 		temp[spacePos + 1] = temp[spacePos + 1].upper();
 		numSpaces--;
 	}
diff --git a/noatun-plugins/lyrics/Makefile.am b/noatun-plugins/lyrics/Makefile.am
index ac34a17..1ddb6ef 100644
--- a/noatun-plugins/lyrics/Makefile.am
+++ b/noatun-plugins/lyrics/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(kde_includes)/kde
 kde_module_LTLIBRARIES = noatunlyrics.la
 
 noatunlyrics_la_SOURCES = lyrics.cpp historymanager.cpp cmodule.cpp
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index efc2d77..6f2183f 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -29,7 +29,7 @@ const char *const DEFAULT_NAME =
   "Everything2,"
   "Everything2 (author info)";
 
-const char *const DEFAULT_QUERY =
+const char *const DEFAULT_TQUERY =
   "http://www.google.com/search?q=lyrics+$(title)+$(author)+$(album),"
   "http://www.purelyrics.com/index.php?search_artist=$(author)&search_album=$(album)&search_title=$(title)&search_lyrics=&search_advsubmit2=Search,"
   "http://search.sing365.com/search.php?searchstr=$(title)&submit=search&category=song,"
@@ -47,23 +47,23 @@ const char *const DEFAULT_QUERY =
 LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) {
   /* Thanks to the kde-usability guys for the help designing this dialog!
    * help to simon edwards of KGuardGod, for a big help designing it */
-  TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
-  vlayout->setStretchFactor( hlayout, 1 );
+  TQVBoxLayout *vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQHBoxLayout *htqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
+  vtqlayout->setStretchFactor( htqlayout, 1 );
 
   // Search box
-  TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
-  boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
+  TQVBoxLayout *boxtqlayout = new TQVBoxLayout( htqlayout, KDialog::spacingHint() );
+  boxtqlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
   providersBox = new KListBox( this, "providersBox" );
-  boxlayout->addWidget(providersBox);
+  boxtqlayout->addWidget(providersBox);
 
-  boxButtons = new KButtonBox( this, Vertical );
-  boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) );
-  boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) );
-  boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) );
-  boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) );
-  boxButtons->layout();
-  boxlayout->addWidget( boxButtons );
+  boxButtons = new KButtonBox( this,Qt::Vertical );
+  boxButtons->addButton( i18n( "New Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) );
+  boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) );
+  boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) );
+  boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) );
+  boxButtons->tqlayout();
+  boxtqlayout->addWidget( boxButtons );
 
   // Edit box
   TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this );
@@ -76,8 +76,8 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
   /* ATTENTION to translators:
    * The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/
   TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel");
-  textLabel->setAlignment(Qt::WordBreak);
-  hlayout->addWidget( propBox, 1 );
+  textLabel->tqsetAlignment(TQt::WordBreak);
+  htqlayout->addWidget( propBox, 1 );
 
   /* Signal/slots */
   nameEdit->setEnabled( false );
@@ -88,7 +88,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
 
 
 
-  vlayout->addStretch();
+  vtqlayout->addStretch();
   reopen();
   save();
 }
@@ -205,7 +205,7 @@ void LyricsCModule::reopen() {
   queryList = conf->readListEntry( "queryList" );
   nameList = conf->readListEntry( "nameList" );
   if ( queryList.count() == 0 && nameList.count() == 0 ) {
-    queryList = TQStringList::split( ",", DEFAULT_QUERY );
+    queryList = TQStringList::split( ",", DEFAULT_TQUERY );
     nameList = TQStringList::split( ",", DEFAULT_NAME );
   }
   TQStringList::Iterator queryIt, nameIt;
diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h
index a7fdc08..7a6ddc1 100644
--- a/noatun-plugins/lyrics/cmodule.h
+++ b/noatun-plugins/lyrics/cmodule.h
@@ -16,6 +16,7 @@ struct SearchProvider {
 
 class LyricsCModule : public CModule {
   Q_OBJECT
+  TQ_OBJECT
   public:
     LyricsCModule(TQObject *_parent);
   public slots:
diff --git a/noatun-plugins/lyrics/historymanager.cpp b/noatun-plugins/lyrics/historymanager.cpp
index 629466d..ac958e3 100644
--- a/noatun-plugins/lyrics/historymanager.cpp
+++ b/noatun-plugins/lyrics/historymanager.cpp
@@ -4,7 +4,7 @@
 *** TODO: Add more complex support (like in Konqueror)
           Maybe use Konqueror's History Manager */
 
-HistoryManager::HistoryManager(TQObject *parent) : TQObject(parent) {
+HistoryManager::HistoryManager(TQObject *tqparent) : TQObject(tqparent) {
 }
 
 HistoryManager::~HistoryManager() {
diff --git a/noatun-plugins/lyrics/historymanager.h b/noatun-plugins/lyrics/historymanager.h
index 910e463..7444f5b 100644
--- a/noatun-plugins/lyrics/historymanager.h
+++ b/noatun-plugins/lyrics/historymanager.h
@@ -7,8 +7,9 @@
 
 class HistoryManager : public TQObject {
   Q_OBJECT
+  TQ_OBJECT
   public:
-    HistoryManager(TQObject *parent = NULL);
+    HistoryManager(TQObject *tqparent = NULL);
     ~HistoryManager();
     KURL back();
     KURL forward();
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 1c7a05b..f0c9ebd 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -27,28 +27,28 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
 {
   lyrics = this;
   /* Create default actions */
-  (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection());
-  ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" );
-  //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection());
-  //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection());
-  //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection());
-  //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection());
+  (void)KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  ( void )KStdAction::goTo( TQT_TQOBJECT(this), TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" );
+  //(void)KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection());
+  //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection());
+  //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
+  //(void)KStdAction::tqfind(TQT_TQOBJECT(this), TQT_SLOT(tqfind()), actionCollection());
   follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
-  KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection());
+  KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection());
   attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url");
   connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool)));
-  back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection());
+  back_act = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection());
   back_act->setEnabled(false);
-  forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection());
+  forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection());
   forward_act->setEnabled(false);
   new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label");
-  site_act = new KSelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
+  site_act = new KSelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
 
   /* Add entry to menu */
-  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics()));
+  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()));
 
   /* Create history manager and htmlpart */
-  history = new HistoryManager(this);
+  history = new HistoryManager(TQT_TQOBJECT(this));
 	htmlpart = new KHTMLPart(this);
 	//htmlpart->view()->setMinimumSize(350, 420);
 
@@ -59,9 +59,9 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
   connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
   connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
 
-  /* Status bar */
+  /* tqStatus bar */
   statusBar()->insertItem(i18n("Ready"), 0, 1);
-  statusBar()->setItemAlignment(0, Qt::AlignLeft);
+  statusBar()->setItemAlignment(0, TQt::AlignLeft);
 
   /* Finalize the GUI */
 	setCentralWidget(htmlpart->view());
@@ -73,7 +73,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
   config->setGroup("Lyrics");
   follow_act->setChecked(config->readBoolEntry("follow", true));
   /* Create config object */
-  new LyricsCModule(this);
+  new LyricsCModule(TQT_TQOBJECT(this));
   
 }
 
@@ -98,7 +98,7 @@ void Lyrics::attach(bool a) {
   if ( !napp->player()->current() )
     return;
   if (a) {
-    KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), TQString::null, "lyrics::attach_info");
+    KMessageBox::information(this, i18n("Choosing this option, the current URL will be attached to the current file. This way, if you try to view the lyrics of this file later, you won't have to search for it again. This information can be stored between sessions, as long as your playlist stores metadata about the multimedia items (almost all the playlists do). If you want to be able to search for other lyrics for this music, you must select this option again to clear the stored URL."), TQString(), "lyrics::attach_info");
     kdDebug(90020) << "Setting URL for (attach)" << napp->player()->current().title() << endl;
     napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url());
     site_act->setEnabled(false);
@@ -122,7 +122,7 @@ void Lyrics::loadedURL()
   if ( !napp->player()->current() )
     return;
   statusBar()->changeItem(i18n("Loaded"), 0);
-  setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title")));
+  setCaption(i18n("Lyrics: %1").tqarg(napp->player()->current().property("title")));
   if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) {
     kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl;
     napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url());
@@ -192,11 +192,11 @@ void Lyrics::viewLyrics(int index)
   int pos = props_regexp.search(url);
   while (pos >= 0) {
     TQString property = props_regexp.cap(1);
-    url.replace(pos, props_regexp.matchedLength(), napp->player()->current().property(property));
+    url.tqreplace(pos, props_regexp.matchedLength(), napp->player()->current().property(property));
     pos = props_regexp.search(url);
   }
 	TQString title(napp->player()->current().property("title"));
-  setCaption(i18n("Loading Lyrics for %1").arg(title));
+  setCaption(i18n("Loading Lyrics for %1").tqarg(title));
 	// Check if we have a music playing
 	if (napp->player()->current()) {
   	htmlpart->begin();
@@ -207,32 +207,32 @@ void Lyrics::viewLyrics(int index)
       "<TR><TD BGCOLOR=\"#707671\"><strong>Title</strong></TD><TD>%1</TD></TR>"
       "<TR><TD BGCOLOR=\"#707671\"><strong>Author</strong></TD><TD>%2</TD></TR>"
       "<TR><TD BGCOLOR=\"#707671\"><strong>Album</strong></TD><TD>%3</TD></TR>"
-    "</TABLE>").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) );
+    "</TABLE>").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( napp->player()->current().property( "album" ) ) );
     KURL _url;
     /* Check if we should use the store url or the query one */
     if (napp->player()->current().property("Lyrics::URL").isEmpty()) {
       /* Use the query one */
       _url = url;
-      _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
+      _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+"));
       kdDebug(90020) << "I'm using the query url" << endl;
       attach_act->setChecked(false);
       site_act->setEnabled(true);
       actionCollection()->action("search_label")->setEnabled(true);
-      htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) );
+      htmlpart->write( i18n( "<hr><p><strong>Searching at %1</strong><br><small>(<a href=\"%3\">%2</a></small>)</p>" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
     } else {
       _url = napp->player()->current().property("Lyrics::URL");
-      _url.setQuery(_url.query().replace(TQRegExp("%20"), "+"));
+      _url.setQuery(_url.query().tqreplace(TQRegExp("%20"), "+"));
       kdDebug(90020) << "I'm using the stored url" << endl;
       attach_act->setChecked(true);
       site_act->setEnabled(false);
       actionCollection()->action("search_label")->setEnabled(false);
-      htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).arg( _url.prettyURL() ).arg( _url.url() ) );
+      htmlpart->write( i18n( "<hr><p><strong>Using the stored URL</strong><br><small>(<a href=\"%2\">%1</a></small>)</p>" ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) );
     }
     htmlpart->write( "</BODY></HTML>" );
     htmlpart->end();
   	go(_url);
   	this->show();
-    KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), TQString::null, "Lyrics::usage_info" );
+    KMessageBox::information( this, i18n( "In order to find the lyrics for the current song, this plugin uses the properties stored with each song, such as its title, author and album. These properties are usually retrieved by a tag reader, but in some cases they may not be present or be incorrect. In that case, the Lyrics plugin will not be able to find the lyrics until these properties are fixed (you can fix them using the tag editor).\nHint: The lucky tag plugin, present in the kdeaddons module, can try to guess properties such as title and author from the filename of a song. Enabling it may increase the probability of finding lyrics." ), TQString(), "Lyrics::usage_info" );
     active = true;
   }
 }
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index 362c7a4..1011f0a 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -14,6 +14,7 @@ class HistoryManager;
 
 class Lyrics : public KMainWindow, public Plugin {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
   Lyrics();
diff --git a/noatun-plugins/nexscope/Makefile.am b/noatun-plugins/nexscope/Makefile.am
index d182ff1..79e0b94 100644
--- a/noatun-plugins/nexscope/Makefile.am
+++ b/noatun-plugins/nexscope/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
 
 METASOURCES = AUTO
 
diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp
index 9a4776e..d483a22 100644
--- a/noatun-plugins/nexscope/gui.cpp
+++ b/noatun-plugins/nexscope/gui.cpp
@@ -10,23 +10,23 @@
 #include "renderers.h"
 #include "nex.h"
 
-class CreatorItem : public QListViewItem
+class CreatorItem : public TQListViewItem
 {
 public:
-	CreatorItem(TQListView *parent, const TQString &title)
-		: TQListViewItem(parent, title)
+	CreatorItem(TQListView *tqparent, const TQString &title)
+		: TQListViewItem(tqparent, title)
 		{}
 };
 
-class TreeItem : public QListViewItem
+class TreeItem : public TQListViewItem
 {
 public:
-	TreeItem(TreeItem *parent, TreeItem *after, CreatorItem *creator)
-		: TQListViewItem(parent, after, creator->text(0))
+	TreeItem(TreeItem *tqparent, TreeItem *after, CreatorItem *creator)
+		: TQListViewItem(tqparent, after, creator->text(0))
 	{
 		RendererList *list;
-		if (parent)
-			list=static_cast<RendererList*>(parent->mRenderer);
+		if (tqparent)
+			list=static_cast<RendererList*>(tqparent->mRenderer);
 		else
 			list=nex->rendererList();
 		
@@ -35,15 +35,15 @@ public:
 			afterRenderer=after->mRenderer;
 		
 		list->lock();
-		int pos=list->renderers().findRef(afterRenderer);
+		int pos=list->renderers().tqfindRef(afterRenderer);
 		if (pos==-1) pos=list->renderers().count();
 		
 		list->renderers().insert((uint)pos, mRenderer=nex->renderer(creator->text(0)));
 		list->unlock();
 	}
 	
-	TreeItem(TQListView *parent, TreeItem *after, const TQString &title)
-		: TQListViewItem(parent, after, title)
+	TreeItem(TQListView *tqparent, TreeItem *after, const TQString &title)
+		: TQListViewItem(tqparent, after, title)
 	{
 		mRenderer=nex->rendererList();
 		setExpandable(true);
@@ -52,8 +52,8 @@ public:
 	~TreeItem()
 	{
 		RendererList *list;
-		if (parent())
-			list=static_cast<RendererList*>(static_cast<TreeItem*>(parent())->mRenderer);
+		if (tqparent())
+			list=static_cast<RendererList*>(static_cast<TreeItem*>(tqparent())->mRenderer);
 		else
 			return;
 		
@@ -149,9 +149,9 @@ void Control::addCreator(const TQString &title)
 	new CreatorItem(mCreatorsList, title);
 }
 
-void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter)
+void Control::dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter)
 {
-//	if ((e->source() == mCreatorsList) && parent)
+//	if ((e->source() == mCreatorsList) && tqparent)
 	{
 		CreatorItem *i=static_cast<CreatorItem*>(mCreatorsList->currentItem());
 		if (!i)
@@ -159,7 +159,7 @@ void Control::dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *
 			std::cerr << "no creatoritem" << std::endl;
 
 		}
-		new TreeItem(static_cast<TreeItem*>(parent), static_cast<TreeItem*>(pafter), i);
+		new TreeItem(static_cast<TreeItem*>(tqparent), static_cast<TreeItem*>(pafter), i);
 	}
 }
 
diff --git a/noatun-plugins/nexscope/gui.h b/noatun-plugins/nexscope/gui.h
index 3fea2ae..a96e137 100644
--- a/noatun-plugins/nexscope/gui.h
+++ b/noatun-plugins/nexscope/gui.h
@@ -13,6 +13,7 @@ class Renderer;
 class Control : public KMainWindow
 {
 Q_OBJECT
+  TQ_OBJECT
 	
 public:
 	Control();
@@ -28,7 +29,7 @@ public slots:
 	void open(const KURL &file);
 	
 protected slots:
-	void dropEvent(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *pafter);
+	void dropEvent(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *pafter);
 	void currentChanged(TQListViewItem *item);
 
 private:
@@ -42,6 +43,7 @@ private:
 class RendererListView : public KListView
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	RendererListView(TQWidget *p);
 	
diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp
index c152c95..e7e4332 100644
--- a/noatun-plugins/nexscope/nex.cpp
+++ b/noatun-plugins/nexscope/nex.cpp
@@ -56,9 +56,9 @@ int Thread::threadRun(void *v)
 	return t->run();
 }
 
-NexCheckBox::NexCheckBox(TQWidget *parent,
+NexCheckBox::NexCheckBox(TQWidget *tqparent,
                          const TQString &name, bool *v)
-	: TQCheckBox(name, parent)
+	: TQCheckBox(name, tqparent)
 {
 	value=v;
 	setChecked(*v);
@@ -71,8 +71,8 @@ void NexCheckBox::change(bool b)
 
 
 
-NexColorButton::NexColorButton(TQWidget *parent, Pixel *color)
-	: KColorButton(parent)
+NexColorButton::NexColorButton(TQWidget *tqparent, Pixel *color)
+	: KColorButton(tqparent)
 {
 	c=color;
 	TQColor temp( (*c >> 16) & 0xFF, (*c >> 8) & 0xFF, *c & 0xFF);
@@ -82,7 +82,7 @@ NexColorButton::NexColorButton(TQWidget *parent, Pixel *color)
 
 void NexColorButton::change(const TQColor &co)
 {
-	*c= COLOR(qRed(co.rgb()), qGreen(co.rgb()), qBlue(co.rgb()));
+	*c= COLOR(tqRed(co.rgb()), tqGreen(co.rgb()), tqBlue(co.rgb()));
 }
 
 void Bitmap::resize(int w, int h)
@@ -401,13 +401,13 @@ void RendererList::load(const TQDomElement &e)
 
 
 
-TQWidget *RendererList::configure(TQWidget *parent)
+TQWidget *RendererList::configure(TQWidget *tqparent)
 {
-	return new RendererListConfigurator(this, parent);
+	return new RendererListConfigurator(this, tqparent);
 }
 
-RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *parent)
-	: TQWidget(parent), mList(l)
+RendererListConfigurator::RendererListConfigurator(RendererList *l, TQWidget *tqparent)
+	: TQWidget(tqparent), mList(l)
 {
 	(new TQVBoxLayout(this))->setAutoAdd(true);
 	mErase=new TQCheckBox(i18n("&Erase between frames"), this);
diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h
index c9477f2..8340b67 100644
--- a/noatun-plugins/nexscope/nex.h
+++ b/noatun-plugins/nexscope/nex.h
@@ -20,8 +20,8 @@ typedef uint8_t Byte;
 
 #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b))
 #define COLORSTR(pixel) \
-	TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \
-		.arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16))
+	TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \
+		.tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16))
 
 #define STRCOLOR(pixel) \
 	Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \
@@ -72,13 +72,14 @@ private:
 	SDL_Thread *mThread;
 };
 
-class Spacer : public QWidget
+class Spacer : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	Spacer(TQWidget *parent) : TQWidget(parent)
+	Spacer(TQWidget *tqparent) : TQWidget(tqparent)
 	{
-		setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+		tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
 			TQSizePolicy::MinimumExpanding));
 	}
 };
@@ -220,11 +221,12 @@ private:
 #include <tqcheckbox.h>
 #include <kcolorbutton.h>
 
-class NexCheckBox : public QCheckBox
+class NexCheckBox : public TQCheckBox
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	NexCheckBox(TQWidget *parent, const TQString &, bool *v);
+	NexCheckBox(TQWidget *tqparent, const TQString &, bool *v);
 
 private slots:
 	void change(bool b);
@@ -237,8 +239,9 @@ private:
 class NexColorButton : public KColorButton
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	NexColorButton(TQWidget *parent, Pixel *color);
+	NexColorButton(TQWidget *tqparent, Pixel *color);
 
 private slots:
 	void change(const TQColor &c);
@@ -266,11 +269,12 @@ class TQCheckBox;
 class TQMultiLineEdit;
 class RendererList;	
 
-class RendererListConfigurator : public QWidget
+class RendererListConfigurator : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	RendererListConfigurator(RendererList *l, TQWidget *parent);
+	RendererListConfigurator(RendererList *l, TQWidget *tqparent);
 	~RendererListConfigurator();
 	
 public slots:
@@ -299,7 +303,7 @@ public:
 	bool clearAfter() const { return mClearAfter; }
 	void setClearAfter(bool b) { mClearAfter=b; }
 	
-	virtual TQWidget *configure(TQWidget *parent);
+	virtual TQWidget *configure(TQWidget *tqparent);
 	
 	virtual void save(TQDomElement &e);
 	
diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp
index e0b3d28..64b6f4f 100644
--- a/noatun-plugins/nexscope/noatunplugin.cpp
+++ b/noatun-plugins/nexscope/noatunplugin.cpp
@@ -45,5 +45,5 @@ void NexPlugin::processExited(KProcess *)
 	unload();
 }
 
-#include  "noatunplugin.moc"
+#include  "noatunplugin.tqmoc"
 
diff --git a/noatun-plugins/nexscope/noatunplugin.h b/noatun-plugins/nexscope/noatunplugin.h
index d1b0ec8..47098c5 100644
--- a/noatun-plugins/nexscope/noatunplugin.h
+++ b/noatun-plugins/nexscope/noatunplugin.h
@@ -7,6 +7,7 @@
 class NexPlugin : public TQObject, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 	
 public:
 	NexPlugin();
diff --git a/noatun-plugins/nexscope/output.cpp b/noatun-plugins/nexscope/output.cpp
index 84885e2..09bfbd2 100644
--- a/noatun-plugins/nexscope/output.cpp
+++ b/noatun-plugins/nexscope/output.cpp
@@ -36,7 +36,7 @@ int OutputSDL::display(Bitmap *source)
 	{
 		switch (event.type)
 		{
-		case SDL_QUIT:
+		case SDL_TQUIT:
 			return Exit;
 		default:
 			break;
diff --git a/noatun-plugins/nexscope/regionwidget.cpp b/noatun-plugins/nexscope/regionwidget.cpp
index 119096b..d760619 100644
--- a/noatun-plugins/nexscope/regionwidget.cpp
+++ b/noatun-plugins/nexscope/regionwidget.cpp
@@ -1,23 +1,23 @@
 
 #include "regionwidget.h"
 
-RegionWidget::RegionWidget(TQWidget *parent)
+RegionWidget::RegionWidget(TQWidget *tqparent)
 {
 
 }
 
-RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *parent)
+RegionWidget::RegionWidget(const TQSize &viewsize, TQWidget *tqparent)
 {
 
 }
 RegionWidget::RegionWidget(int x, int y, int w, int h, const TQSize &viewsize,
-                           TQWidget *parent)
+                           TQWidget *tqparent)
 {
 
 }
 
 RegionWidget::RegionWidget(const TQRect &region, const TQSize &viewsize,
-                           TQWidget *parent)
+                           TQWidget *tqparent)
 {
 
 }
diff --git a/noatun-plugins/nexscope/regionwidget.h b/noatun-plugins/nexscope/regionwidget.h
index 38c919a..ee975ee 100644
--- a/noatun-plugins/nexscope/regionwidget.h
+++ b/noatun-plugins/nexscope/regionwidget.h
@@ -9,15 +9,16 @@
  * text boxes allow the region to be resized and moved, along with
  * click-n-drag
  **/
-class RegionWidget : public QFrame
+class RegionWidget : public TQFrame
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	RegionWidget(TQWidget *parent);
-	RegionWidget(const TQSize &viewsize, TQWidget *parent);
+	RegionWidget(TQWidget *tqparent);
+	RegionWidget(const TQSize &viewsize, TQWidget *tqparent);
 	RegionWidget(int x, int y, int w, int h, const TQSize &viewsize, 
-	             TQWidget *parent);
-	RegionWidget(const TQRect &region, const TQSize &viewsize, TQWidget *parent);
+	             TQWidget *tqparent);
+	RegionWidget(const TQRect &region, const TQSize &viewsize, TQWidget *tqparent);
 	
 	~RegionWidget();
 	
diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp
index f5e97c9..37db147 100644
--- a/noatun-plugins/nexscope/renderers.cpp
+++ b/noatun-plugins/nexscope/renderers.cpp
@@ -6,7 +6,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
 
-struct HorizontalPair : public Renderer
+structQt::HorizontalPair : public Renderer
 {
 	HorizontalPair() : color(0x578cd8) 
 	{
@@ -15,9 +15,9 @@ struct HorizontalPair : public Renderer
 		pair=true;
 	}
 	
-	TQWidget *configure(TQWidget *parent)
+	TQWidget *configure(TQWidget *tqparent)
 	{
-		TQWidget *config=new TQWidget(parent);
+		TQWidget *config=new TQWidget(tqparent);
 		(new TQVBoxLayout(config))->setAutoAdd(true);
 
 		new NexColorButton(config, &color);
diff --git a/noatun-plugins/nexscope/renderers.h b/noatun-plugins/nexscope/renderers.h
index 5d75eeb..e23304a 100644
--- a/noatun-plugins/nexscope/renderers.h
+++ b/noatun-plugins/nexscope/renderers.h
@@ -23,7 +23,7 @@ Renderer *function();
 
 REGISTER(fade, Fade)
 REGISTER(doubler, Doubler)
-REGISTER(waveform, HorizontalPair);
+REGISTER(waveform,Qt::HorizontalPair);
 REGISTER(hartley, Hartley);
 
 #undef REGISTER
diff --git a/noatun-plugins/noatunmadness/Makefile.am b/noatun-plugins/noatunmadness/Makefile.am
index 973ae51..e3a6d17 100644
--- a/noatun-plugins/noatunmadness/Makefile.am
+++ b/noatun-plugins/noatunmadness/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes)
+INCLUDES= $(all_includes) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = noatunmadness.la
 noatunmadness_la_SOURCES = madness.cpp
diff --git a/noatun-plugins/noatunmadness/madness.cpp b/noatun-plugins/noatunmadness/madness.cpp
index 7027029..81fa2c4 100644
--- a/noatun-plugins/noatunmadness/madness.cpp
+++ b/noatun-plugins/noatunmadness/madness.cpp
@@ -55,7 +55,7 @@ void Madness::update()
 	for (; it != mWindowList.end(); ++it)
 	{
 		TQRect area=KWin::info(*it).frameGeometry;
-		if (!mOriginalPositions.contains(*it))
+		if (!mOriginalPositions.tqcontains(*it))
 			mOriginalPositions.insert(*it, area.topLeft());
 	}
 }
diff --git a/noatun-plugins/noatunmadness/madness.h b/noatun-plugins/noatunmadness/madness.h
index 8076d0a..c48c676 100644
--- a/noatun-plugins/noatunmadness/madness.h
+++ b/noatun-plugins/noatunmadness/madness.h
@@ -10,6 +10,7 @@
 class Madness : public TQObject, public MonoFFTScope, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	Madness();
 	virtual ~Madness();
diff --git a/noatun-plugins/oblique/Makefile.am b/noatun-plugins/oblique/Makefile.am
index 09b200c..4b2789c 100644
--- a/noatun-plugins/oblique/Makefile.am
+++ b/noatun-plugins/oblique/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = . schemas
 
-INCLUDES= -I$(top_srcdir)/noatun/library $(all_includes)
+INCLUDES= -I$(top_srcdir)/noatun/library $(all_includes) -I$(kde_includes)/kde
 kde_module_LTLIBRARIES = noatun_oblique.la
 
 noatun_oblique_la_SOURCES = base.cpp kbuffer.cpp query.cpp oblique.cpp tree.cpp file.cpp selector.cpp menu.cpp cmodule.cpp kdatacollection.cpp view.cpp
diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp
index c9e6fb6..6288f20 100644
--- a/noatun-plugins/oblique/base.cpp
+++ b/noatun-plugins/oblique/base.cpp
@@ -133,7 +133,7 @@ File Base::add(const TQString &file)
 	return File();
 }
 
-File Base::find(FileId id)
+File Base::tqfind(FileId id)
 {
 	if (id == 0) return File();
 
@@ -155,7 +155,7 @@ void Base::clear()
 {
 	for (FileId id = high(); id >= 1; id--)
 	{
-		File f = find(id);
+		File f = tqfind(id);
 		if (f)
 			f.remove();
 	}
@@ -171,7 +171,7 @@ File Base::first(FileId first)
 {
 	if (first > high()) return File();
 
-	while (!find(first))
+	while (!tqfind(first))
 	{
 		++first;
 		if (first > high())
@@ -183,8 +183,8 @@ File Base::first(FileId first)
 TQString Base::property(FileId id, const TQString &property) const
 {
 	loadIntoCache(id);
-	if (!d->cachedProperties.contains(property)) return TQString::null;
-	TQMap<TQString,TQString>::Iterator i = d->cachedProperties.find(property);
+	if (!d->cachedProperties.tqcontains(property)) return TQString();
+	TQMap<TQString,TQString>::Iterator i = d->cachedProperties.tqfind(property);
 	return i.data();
 }
 
diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h
index 611c5fe..948ec78 100644
--- a/noatun-plugins/oblique/base.h
+++ b/noatun-plugins/oblique/base.h
@@ -15,9 +15,10 @@ class Slice;
 
 typedef unsigned int FileId;
 
-class Base : public QObject
+class Base : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 	struct Private;
 	Private *d; // not for BC, but for compile times :)
@@ -31,7 +32,7 @@ public:
 
 	File add(const TQString &file);
 
-	File find(FileId id);
+	File tqfind(FileId id);
 
 	void clear();
 
@@ -95,7 +96,7 @@ private: // friends for Slice
 
 private:
 	/**
-	 * load the xml that lives at the head of the db and contains
+	 * load the xml that lives at the head of the db and tqcontains
 	 * potentially lots of structured data
 	 **/
 	void loadMetaXML(const TQString &xml);
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 729ff54..5df19b0 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -28,17 +28,17 @@
 #include <tqtabwidget.h>
 #include <tqheader.h>
 
-SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
-	: TQWidget(parent)
+SchemaConfig::SchemaConfig(TQWidget *tqparent, Oblique *oblique)
+	: TQWidget(tqparent)
 {
 	mOblique = oblique;
 	mIgnore = true;
 	mRegexpEditor=0;
 
 	{
-		TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7);
-		layout->setAutoAdd(true);
-		layout->setSpacing(7);
+		TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7);
+		tqlayout->setAutoAdd(true);
+		tqlayout->setSpacing(7);
 	}
 
 
@@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
 			connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
 
 			mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox);
-			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent"));
+			TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's tqparent"));
 			connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent()));
 
 			mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox);
@@ -176,14 +176,14 @@ class QueryGroupItem : public KListViewItem
 	QueryGroup *mItem;
 
 public:
-	QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0)
-		: KListViewItem(parent, after)
+	QueryGroupItem(QueryGroupItem *tqparent, QueryGroup *group, QueryGroupItem *after=0)
+		: KListViewItem(tqparent, after)
 	{
 		init(group);
 	}
 
-	QueryGroupItem(KListView *parent, QueryGroup *group, QueryGroupItem *after=0)
-		: KListViewItem(parent, after)
+	QueryGroupItem(KListView *tqparent, QueryGroup *group, QueryGroupItem *after=0)
+		: KListViewItem(tqparent, after)
 	{
 		init(group);
 	}
@@ -198,8 +198,8 @@ public:
 		setText(2, item()->presentation());
 	}
 
-	QueryGroupItem *parent()
-		{ return static_cast<QueryGroupItem*>(KListViewItem::parent()); }
+	QueryGroupItem *tqparent()
+		{ return static_cast<QueryGroupItem*>(KListViewItem::tqparent()); }
 
 	KListView *listView()
 		{ return static_cast<KListView*>(KListViewItem::listView()); }
@@ -218,8 +218,8 @@ private:
 		{
 			if (QueryGroup *after = group->nextSibling())
 			{
-				if (parent())
-					new QueryGroupItem(parent(), after, this);
+				if (tqparent())
+					new QueryGroupItem(tqparent(), after, this);
 				else
 					new QueryGroupItem(listView(), after, this);
 			}
@@ -272,7 +272,7 @@ void SchemaConfig::save()
 TQString SchemaConfig::nameToFilename(const TQString &_name)
 {
 	TQString name = _name;
-	name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_");
+	name = name.tqreplace(TQRegExp("[^a-zA-Z0-9]"), "_");
 	return name;
 }
 
@@ -288,7 +288,7 @@ void SchemaConfig::newSchema()
 
 	TQString filename = nameToFilename(str);
 
-	if (mQueries.contains(nameToFilename(filename))) return;
+	if (mQueries.tqcontains(nameToFilename(filename))) return;
 
 	QueryItem queryitem;
 	queryitem.query = Query();
@@ -312,7 +312,7 @@ void SchemaConfig::copySchema()
 
 	TQString filename = nameToFilename(str);
 
-	if (mQueries.contains(nameToFilename(filename))) return;
+	if (mQueries.tqcontains(nameToFilename(filename))) return;
 
 	QueryItem queryitem;
 	queryitem.query = currentQuery()->query;
@@ -355,7 +355,7 @@ void SchemaConfig::editValueRegexp()
 	{
 		mRegexpEditor =
 			KParts::ComponentFactory::createInstanceFromQuery<TQDialog>(
-					"KRegExpEditor/KRegExpEditor", TQString::null, this
+					"KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this)
 				);
 	}
 
@@ -413,7 +413,7 @@ void SchemaConfig::move(TQListViewItem *_item, TQListViewItem *, TQListViewItem
 	QueryGroupItem *afterNow = static_cast<QueryGroupItem*>(_afterNow);
 
 	QueryGroup *after, *under;
-	under = item->parent() ? item->parent()->item() : 0;
+	under = item->tqparent() ? item->tqparent()->item() : 0;
 	after = afterNow ? afterNow->item() : 0;
 
 	item->item()->move(&currentQuery()->query, under, after);
@@ -436,8 +436,8 @@ void SchemaConfig::addSibling()
 
 	// now match the action in the tree
 	QueryGroupItem *created;
-	if (item->parent())
-		created = new QueryGroupItem(item->parent(), g, item);
+	if (item->tqparent())
+		created = new QueryGroupItem(item->tqparent(), g, item);
 	else
 		created = new QueryGroupItem(item->listView(), g, item);
 
@@ -500,8 +500,8 @@ SchemaConfig::QueryItem *SchemaConfig::currentQuery()
 }
 
 
-SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique)
-	: TQWidget(parent)
+SliceConfig::SliceConfig(TQWidget *tqparent, Oblique *oblique)
+	: TQWidget(tqparent)
 {
 	mOblique = oblique;
 	(new TQVBoxLayout(this, 11, 7))->setAutoAdd(true);
@@ -539,16 +539,16 @@ class SliceListItem : public KListViewItem
 {
 	Slice *mSlice;
 public:
-	SliceListItem(KListView *parent, Slice *slice)
-		 : KListViewItem(parent, slice->name()), mSlice(slice)
+	SliceListItem(KListView *tqparent, Slice *slice)
+		 : KListViewItem(tqparent, slice->name()), mSlice(slice)
 	{
 	}
 
 	/**
 	 * new item
 	 **/
-	SliceListItem(KListView *parent)
-		 : KListViewItem(parent, i18n("New Slice")), mSlice(0)
+	SliceListItem(KListView *tqparent)
+		 : KListViewItem(tqparent, i18n("New Slice")), mSlice(0)
 	{
 	}
 
@@ -621,7 +621,7 @@ void SliceConfig::addSibling()
 void SliceConfig::removeSelf()
 {
 	SliceListItem *r = currentItem();
-	if (mAddedItems.contains(r))
+	if (mAddedItems.tqcontains(r))
 	{
 		mAddedItems.remove(r);
 	}
diff --git a/noatun-plugins/oblique/cmodule.h b/noatun-plugins/oblique/cmodule.h
index e935051..39bc7a9 100644
--- a/noatun-plugins/oblique/cmodule.h
+++ b/noatun-plugins/oblique/cmodule.h
@@ -16,9 +16,10 @@ class TQComboBox;
 class TQPushButton;
 class TQTabWidget;
 
-class SchemaConfig : public QWidget
+class SchemaConfig : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 
 	KListView *mSchemaTree;
@@ -44,7 +45,7 @@ Q_OBJECT
 	TQMap<TQString, QueryItem> mQueries;
 
 public:
-	SchemaConfig(TQWidget *parent, Oblique *oblique);
+	SchemaConfig(TQWidget *tqparent, Oblique *oblique);
 
 	Oblique *oblique() { return mOblique; }
 
@@ -81,9 +82,10 @@ private:
 
 class SliceListItem;
 
-class SliceConfig : public QWidget
+class SliceConfig : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 	KListView *mSliceList;
 	TQPushButton *mAdd, *mRemove;
@@ -91,7 +93,7 @@ Q_OBJECT
 	TQValueList<Slice*> mRemovedItems;
 
 public:
-	SliceConfig(TQWidget *parent, Oblique *oblique);
+	SliceConfig(TQWidget *tqparent, Oblique *oblique);
 	Oblique *oblique() { return mOblique; }
 
 	void reopen();
@@ -108,12 +110,13 @@ private slots:
 class Configure : public CModule
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQTabWidget *tabs;
 	SchemaConfig *schema;
 	SliceConfig *slice;
 
 public:
-	Configure(Oblique *parent);
+	Configure(Oblique *tqparent);
 
 	virtual void reopen();
 	virtual void save();
diff --git a/noatun-plugins/oblique/kbuffer.cpp b/noatun-plugins/oblique/kbuffer.cpp
index f54110e..04a28fb 100644
--- a/noatun-plugins/oblique/kbuffer.cpp
+++ b/noatun-plugins/oblique/kbuffer.cpp
@@ -33,12 +33,16 @@ void KBuffer::flush(){
 }
 
 /** query buffer size */
-Q_ULONG KBuffer::size() const {
+#ifdef USE_QT4
+qint64 KBuffer::size() const {
+#else // USE_QT4
+TQ_ULONG KBuffer::size() const {
+#endif // USE_QT4
   return buf.size();
 }
 
 /** read a block of memory from buffer, advances read/write position */
-Q_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) {
+TQ_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) {
   int len;
   if ((long unsigned)(buf.end()-bufPos) > maxLen)
     len = maxLen;
@@ -52,7 +56,7 @@ Q_LONG KBuffer::readBlock(char* data, long unsigned int maxLen) {
 }
 
 /** write a block of memory into buffer */
-Q_LONG KBuffer::writeBlock(const char *data, long unsigned int len){
+TQ_LONG KBuffer::writeBlock(const char *data, long unsigned int len){
   int pos = bufPos-buf.begin();
   copy(data, data+len, inserter(buf,bufPos));
   bufPos = buf.begin() + pos + len;
diff --git a/noatun-plugins/oblique/kbuffer.h b/noatun-plugins/oblique/kbuffer.h
index 63e626b..0341fef 100644
--- a/noatun-plugins/oblique/kbuffer.h
+++ b/noatun-plugins/oblique/kbuffer.h
@@ -21,15 +21,19 @@ public:
   /** open a memory buffer */
   bool open(int mode);
   /** read in a block of memory */
-  Q_LONG readBlock(char* data, long unsigned int maxLen);
+  TQ_LONG readBlock(char* data, long unsigned int maxLen);
   /** query buffer size */
-  Q_ULONG size() const;
+#ifdef USE_QT4
+  qint64 size() const;
+#else // USE_QT4
+  TQ_ULONG size() const;
+#endif // USE_QT4
   /** No descriptions */
   void flush();
   /** Close buffer */
   void close();
   /** write a block of memory */
-  Q_LONG writeBlock(const char *data, long unsigned int maxLen);
+  TQ_LONG writeBlock(const char *data, long unsigned int maxLen);
   /** read a byte */
   int getch();
   /** undo last getch()
@@ -40,6 +44,12 @@ public:
   void* data() {
     return &buf[0];
   }
+
+#ifdef USE_QT4
+	virtual inline qint64 readData ( char * data, qint64 maxSize ) { return readBlock(data, maxSize); }
+	virtual inline qint64 writeData ( const char * data, qint64 maxSize ) { return writeBlock(data, maxSize); }
+#endif // USE_QT4
+
 private:
   std::vector<char> buf;
   std::vector<char>::iterator bufPos;
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index ed57aea..fc92093 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -85,7 +85,7 @@ TQStringList KDataCollection::names() const
 	{
 		TQFileInfo fi(*i);
 		TQString name = fi.fileName();
-		if (!n.contains(name))
+		if (!n.tqcontains(name))
 		{
 			total.append(name);
 		}
@@ -108,7 +108,7 @@ void KDataCollection::remove(const TQString &name)
 	}
 
 	TQStringList n = g.readListEntry(mEntry);
-	if (n.contains(name)) return;
+	if (n.tqcontains(name)) return;
 	n.append(name);
 	g.writeEntry(mEntry, n);
 }
@@ -137,7 +137,7 @@ TQString KDataCollection::saveFile(const TQString &name, bool create)
 		}
 		return s;
 	}
-	return TQString::null;
+	return TQString();
 }
 
 
diff --git a/noatun-plugins/oblique/kdbt.h b/noatun-plugins/oblique/kdbt.h
index 4ecc71a..ec3f25e 100644
--- a/noatun-plugins/oblique/kdbt.h
+++ b/noatun-plugins/oblique/kdbt.h
@@ -18,7 +18,7 @@
 template <typename T>
 class KDbt : public Dbt {
 public:
-  /* assume streaming operators on QDataStream
+  /* assume streaming operators on TQDataStream
   TQDataStream & operator>> ( TQDataStream& >>, T &);
   TQDataStream & operator<< ( TQDataStream& >>, T &);
   */
diff --git a/noatun-plugins/oblique/menu.cpp b/noatun-plugins/oblique/menu.cpp
index 3867f19..ae22592 100644
--- a/noatun-plugins/oblique/menu.cpp
+++ b/noatun-plugins/oblique/menu.cpp
@@ -7,8 +7,8 @@
 
 #include "tree.h"
 
-FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file)
-	: KPopupMenu(parent)
+FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, File file)
+	: KPopupMenu(tqparent)
 {
 	if (file)
 		mFiles.append(file);
@@ -20,8 +20,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file)
 
 	(new SliceListAction(
 			i18n("&Slices"), oblique,
-			this, TQT_SLOT(toggleInSlice(Slice *)),
-			mFiles, this
+			TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)),
+			mFiles, TQT_TQOBJECT(this)
 		))->plug(this);
 }
 
@@ -39,8 +39,8 @@ static void addTo(TQValueList<File> &files, TreeItem *item)
 	}
 }
 
-FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items)
-	: KPopupMenu(parent)
+FileMenu::FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *items)
+	: KPopupMenu(tqparent)
 {
 	addTo(mFiles, items);
 
@@ -52,8 +52,8 @@ FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items)
 
 	(new SliceListAction(
 			i18n("&Slices"), oblique,
-			this, TQT_SLOT(toggleInSlice(Slice *)),
-			mFiles, this
+			TQT_TQOBJECT(this), TQT_SLOT(toggleInSlice(Slice *)),
+			mFiles,TQT_TQOBJECT(this)
 		))->plug(this);
 }
 
@@ -67,7 +67,7 @@ void FileMenu::removeFromList()
 
 void FileMenu::properties()
 {
-	new ObliquePropertiesDialog(mFiles, parentWidget());
+	new ObliquePropertiesDialog(mFiles, tqparentWidget());
 }
 
 void FileMenu::toggleInSlice(Slice *slice)
@@ -92,8 +92,8 @@ void FileMenu::toggleInSlice(Slice *slice)
 SliceListAction::SliceListAction(
 		const TQString &text, Oblique *oblique,
 		TQObject *reciever, const char *slot,
-		const TQValueList<File> &files, TQObject *parent, const char *name
-	) : KActionMenu(text, parent, name)
+		const TQValueList<File> &files, TQObject *tqparent, const char *name
+	) : KActionMenu(text, tqparent, name)
 {
 	mFiles = files;
 	mOblique = oblique;
@@ -153,8 +153,8 @@ void SliceListAction::hit(int index)
 SchemaListAction::SchemaListAction(
 		const TQString &text,
 		TQObject *reciever, const char *slot,
-		TQObject *parent, const char *name
-	) : KActionMenu(text, parent, name)
+		TQObject *tqparent, const char *name
+	) : KActionMenu(text, tqparent, name)
 {
 	mTree = 0;
 	if (reciever)
@@ -197,8 +197,8 @@ void SchemaListAction::hit(int index)
 
 
 
-ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent)
-	: KPropertiesDialog(makeItems(files), parent), mFiles(files)
+ObliquePropertiesDialog::ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent)
+	: KPropertiesDialog(makeItems(files), tqparent), mFiles(files)
 {
 	connect(this, TQT_SIGNAL(propertiesClosed()), TQT_SLOT(deleteLater()));
 	connect(this, TQT_SIGNAL(applied()), TQT_SLOT(modified()));
diff --git a/noatun-plugins/oblique/menu.h b/noatun-plugins/oblique/menu.h
index da464dc..1c12fa7 100644
--- a/noatun-plugins/oblique/menu.h
+++ b/noatun-plugins/oblique/menu.h
@@ -17,14 +17,15 @@
 class FileMenu : public KPopupMenu
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQValueList<File> mFiles;
 
 public:
-	FileMenu(TQWidget *parent, Oblique *oblique, File file);
+	FileMenu(TQWidget *tqparent, Oblique *oblique, File file);
 	/**
 	 * @recursively uses everything under @p files
 	 **/
-	FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *files);
+	FileMenu(TQWidget *tqparent, Oblique *oblique, TreeItem *files);
 
 private slots:
 	void removeFromList();
@@ -35,6 +36,7 @@ private slots:
 class SliceListAction : public KActionMenu
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQMap<int, Slice*> mIndexToSlices;
 	TQValueList<File> mFiles;
 	Oblique *mOblique;
@@ -43,7 +45,7 @@ public:
 	SliceListAction(
 			const TQString &text, Oblique *oblique,
 			TQObject *reciever, const char *slot,
-			const TQValueList<File> &files = TQValueList<File>(), TQObject *parent=0, const char *name=0
+			const TQValueList<File> &files = TQValueList<File>(), TQObject *tqparent=0, const char *name=0
 		);
 
 signals:
@@ -58,6 +60,7 @@ private slots:
 class SchemaListAction : public KActionMenu
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQMap<int, TQString> mIndexToSchemas;
 	Tree *mTree;
 
@@ -65,7 +68,7 @@ public:
 	SchemaListAction(
 			const TQString &text,
 			TQObject *reciever, const char *slot,
-			TQObject *parent, const char *name
+			TQObject *tqparent, const char *name
 		);
 
 	void setTree(Tree *tree) { mTree = tree; }
@@ -82,10 +85,11 @@ private slots:
 class ObliquePropertiesDialog : public KPropertiesDialog
 {
 Q_OBJECT
+  TQ_OBJECT
 	TQValueList<File> mFiles;
 
 public:
-	ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *parent);
+	ObliquePropertiesDialog(const TQValueList<File> &files, TQWidget *tqparent);
 
 private:
 	static KFileItemList makeItems(const TQValueList<File> &files);
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index 234833a..e297e2b 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -215,7 +215,7 @@ void Loader::loadItemsDeferred()
 			return;
 		}
 
-		File f = mBase->find(mDeferredLoaderAt);
+		File f = mBase->tqfind(mDeferredLoaderAt);
 
 		if (f)
 		{
diff --git a/noatun-plugins/oblique/oblique.h b/noatun-plugins/oblique/oblique.h
index f7e6bc8..8755e55 100644
--- a/noatun-plugins/oblique/oblique.h
+++ b/noatun-plugins/oblique/oblique.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2003-2005 Charles Samuels <charles@kde.org>
 // See the file COPYING for redistribution terms.
 
-#ifndef OBLIQUE_H
-#define OBLIQUE_H
+#ifndef OBLITQUE_H
+#define OBLITQUE_H
 
 #include <noatun/playlist.h>
 #include <noatun/plugin.h>
@@ -27,6 +27,7 @@ namespace KIO
 class Oblique : public Playlist, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 	View *mView;
 	Base *mBase;
 	Selector *mSelector;
@@ -86,9 +87,10 @@ private slots:
 /**
  * loads the database into a Tree
  **/
-class Loader : public QObject
+class Loader : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 	// the id of the next file to load
 	FileId mDeferredLoaderAt;
 	Tree *mTree;
@@ -109,9 +111,10 @@ private slots:
  * emits @ref done() when finished so you
  * can delete it
  **/
-class DirectoryAdder : public QObject
+class DirectoryAdder : public TQObject
 {
 	Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 	KURL::List pendingAddDirectories;
 	KURL::List::Iterator lastAddedSubDirectory;
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index 8c85b59..0727ca6 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -171,7 +171,7 @@ TQString QueryGroup::presentation(const File &file) const
 			uint len=counter.cap(1).length()-1;
 
 			// and half them, and remove one more
-			format.replace(start-1, len/2+1, "");
+			format.tqreplace(start-1, len/2+1, "");
 			start=start-1+len/2+find.cap(1).length()+3;
 			continue;
 		}
@@ -186,7 +186,7 @@ TQString QueryGroup::presentation(const File &file) const
 			uint len=counter.cap(1).length();
 
 			// and half them
-			format.replace(start, len/2, "");
+			format.tqreplace(start, len/2, "");
 			start=start+len/2;
 		}
 
@@ -250,12 +250,12 @@ TQString QueryGroup::presentation(const File &file) const
 		if (propval.length())
 		{
 			propval = prefix+propval+suffix;
-			format.replace(start, i+2, propval);
+			format.tqreplace(start, i+2, propval);
 			start += propval.length();
 		}
 		else
 		{
-			format.replace(start, i+2, "");
+			format.tqreplace(start, i+2, "");
 		}
 	}
 	return format;
@@ -283,10 +283,10 @@ Query &Query::operator =(const Query &copy)
 	if (&copy == this) return *this;
 	delete mGroupFirst;
 	mGroupFirst=0;
-	if (const QueryGroup *parent = copy.firstChild())
+	if (const QueryGroup *tqparent = copy.firstChild())
 	{
-		mGroupFirst = new QueryGroup(*parent);
-		deepCopy(parent->firstChild(), mGroupFirst);
+		mGroupFirst = new QueryGroup(*tqparent);
+		deepCopy(tqparent->firstChild(), mGroupFirst);
 	}
 	return *this;
 }
@@ -321,7 +321,7 @@ void Query::clear()
 TQString Query::load(const TQString &filename)
 {
 	TQFile file(filename);
-	unless (file.open(IO_ReadOnly)) return TQString::null;
+	unless (file.open(IO_ReadOnly)) return TQString();
 
 	TQDomDocument doc;
 	doc.setContent(&file);
@@ -346,7 +346,7 @@ TQString Query::load(TQDomElement element)
 	}
 	else
 	{
-		return TQString::null;
+		return TQString();
 	}
 
 	// for internationalization:
@@ -383,7 +383,7 @@ void Query::save(const TQString &name, const TQString &filename)
 	// scourge elimination
 	TQString data = doc.toString();
 	TQString old = data;
-	while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
+	while (data.tqreplace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
 	{
 		old = data;
 	}
@@ -422,8 +422,8 @@ static void dump(QueryGroup *item, int depth)
 	{
 		for (int d = 0; d < depth; d++)
 			std::cerr << "    ";
-		std::cerr << "prop: " << item->propertyName().utf8() << " pres: "
-			<< item->presentation().utf8() << std::endl;
+		std::cerr << "prop: " << item->propertyName().utf8().data() << " pres: "
+			<< item->presentation().utf8().data() << std::endl;
 		dump(item->firstChild(), depth+1);
 
 	} while ((item = item->nextSibling()));
@@ -438,17 +438,17 @@ void Query::dump()
 
 
 
-void Query::loadGroup(TQDomElement element, QueryGroup *parent)
+void Query::loadGroup(TQDomElement element, QueryGroup *tqparent)
 {
 	TQDomNode node = element.firstChild();
 
 	QueryGroup *group = new QueryGroup;
-	if (parent)
+	if (tqparent)
 	{
-		if (QueryGroup *last = parent->lastChild())
+		if (QueryGroup *last = tqparent->lastChild())
 			last->setNextSibling(group);
 		else
-			parent->setFirstChild(group);
+			tqparent->setFirstChild(group);
 	}
 	else
 	{
@@ -487,7 +487,7 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent)
 					group->setOption(QueryGroup::Playable, true);
 				else if (e.tagName().lower() == "playable")
 					group->setOption(QueryGroup::Playable, true);
-				else if (e.tagName().lower() == "childrenvisible")
+				else if (e.tagName().lower() == "tqchildrenvisible")
 					group->setOption(QueryGroup::ChildrenVisible, true);
 				else if (e.tagName().lower() == "autoopen")
 					group->setOption(QueryGroup::AutoOpen, true);
@@ -500,11 +500,11 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent)
 	}
 }
 
-void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
+void Query::saveGroup(TQDomElement &tqparent, QueryGroup *group)
 {
-	TQDomDocument doc = parent.ownerDocument();
+	TQDomDocument doc = tqparent.ownerDocument();
 	TQDomElement element = doc.createElement("group");
-	parent.appendChild(element);
+	tqparent.appendChild(element);
 
 	TQDomElement childe;
 	TQDomText childtext;
@@ -534,7 +534,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group)
 		if (group->option(QueryGroup::Playable))
 			childe.appendChild(doc.createElement("playable"));
 		if (group->option(QueryGroup::ChildrenVisible))
-			childe.appendChild(doc.createElement("childrenvisible"));
+			childe.appendChild(doc.createElement("tqchildrenvisible"));
 		if (group->option(QueryGroup::AutoOpen))
 			childe.appendChild(doc.createElement("autoopen"));
 	}
diff --git a/noatun-plugins/oblique/query.h b/noatun-plugins/oblique/query.h
index e8a8d23..60478ff 100644
--- a/noatun-plugins/oblique/query.h
+++ b/noatun-plugins/oblique/query.h
@@ -1,8 +1,8 @@
 // Copyright (c) 2003 Charles Samuels <charles@kde.org>
 // See the file COPYING for redistribution terms.
 
-#ifndef QUERY_H
-#define QUERY_H
+#ifndef TQUERY_H
+#define TQUERY_H
 
 #include "base.h"
 
@@ -99,7 +99,7 @@ private:
 	 **/
 	TQString fuzzify(const TQString &str) const;
 	/**
-	 * @returns the previous or parent of this item (slow)
+	 * @returns the previous or tqparent of this item (slow)
 	 **/
 	QueryGroup *previous(Query *query);
 	QueryGroup *previous(QueryGroup *startWith);
@@ -160,8 +160,8 @@ public:
 	TQString dbname(Base *base);
 
 private:
-	void loadGroup(TQDomElement element, QueryGroup *parent=0);
-	void saveGroup(TQDomElement &parent, QueryGroup *group);
+	void loadGroup(TQDomElement element, QueryGroup *tqparent=0);
+	void saveGroup(TQDomElement &tqparent, QueryGroup *group);
 
 	void deepCopy(const QueryGroup *from, QueryGroup *toParent);
 	
diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp
index f28c333..004cf91 100644
--- a/noatun-plugins/oblique/selector.cpp
+++ b/noatun-plugins/oblique/selector.cpp
@@ -129,7 +129,7 @@ Item *SequentialSelector::current()
 
 void SequentialSelector::setCurrent(const Item &item)
 {
-	TreeItem *current = mTree->find(item.itemFile());
+	TreeItem *current = mTree->tqfind(item.itemFile());
 	setCurrent(current);
 }
 
@@ -210,7 +210,7 @@ Item *RandomSelector::current()
 
 void RandomSelector::setCurrent(const Item &item)
 {
-	setCurrent(mTree->find(item.itemFile()), 0);
+	setCurrent(mTree->tqfind(item.itemFile()), 0);
 }
 
 void RandomSelector::setCurrent(TreeItem *item, TreeItem *previous)
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index 0087b99..430d4cf 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -76,7 +76,7 @@ static void treeItemSort(TreeItem **begin, TreeItem **end)
 
 static void treeItemSort(TreeItem *first)
 {
-	const int count = first->parent() ? first->parent()->childCount() : first->listView()->childCount();
+	const int count = first->tqparent() ? first->tqparent()->childCount() : first->listView()->childCount();
 	if (count < 2) return;
 	
 	Query *q = first->tree()->query();
@@ -149,28 +149,28 @@ inline static void sortify(T *item)
 }
 
 
-TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p)
-	: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
+TreeItem::TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p)
+	: KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false)
 {
 	if (group->option(QueryGroup::Playable))
 	{
 		if (mFile = file)
-			parent->mPlayableItemCount++;
+			tqparent->mPlayableItemCount++;
 	}
 	
-	sortify(parent);
+	sortify(tqparent);
 }
 
-TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p)
-	: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
+TreeItem::TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p)
+	: KListViewItem(tqparent, p), mGroup(group), mUserOpened(false), mHidden(false)
 {
 	if (group->option(QueryGroup::Playable))
 	{
 		if (mFile = file)
-			parent->tree()->mPlayableItemCount++;
+			tqparent->tree()->mPlayableItemCount++;
 	}
 	
-	sortify(parent);
+	sortify(tqparent);
 }
 
 TreeItem::~TreeItem()
@@ -180,7 +180,7 @@ TreeItem::~TreeItem()
 		tree()->mPlayableItemCount--;
 	}
 
-	// I have to remove my children, because they need their parent
+	// I have to remove my tqchildren, because they need their tqparent
 	// in tact for the below code
 	while (TreeItem *c = firstChild())
 		delete c;
@@ -258,14 +258,14 @@ TQString TreeItem::presentation() const
 	return text(0);
 }
 
-TreeItem *TreeItem::find(File item)
+TreeItem *TreeItem::tqfind(File item)
 {
 	TreeItem *i = firstChild();
 	while (i)
 	{
 		if (i->file() == item) return i;
 
-		TreeItem *found = i->find(item);
+		TreeItem *found = i->tqfind(item);
 		if (found and found->playable()) return found;
 		i = i->nextSibling();
 	}
@@ -297,7 +297,7 @@ void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int w
 	}
 
 	TQColorGroup newcg(cg);
-	if (parent() && parent()->isOpen() && !parent()->mUserOpened)
+	if (tqparent() && tqparent()->isOpen() && !tqparent()->mUserOpened)
 	{
 		// slow, but not often used
 		TQColor text = newcg.text();
@@ -338,8 +338,8 @@ void TreeItem::autoExpand()
 
 void TreeItem::forceAutoExpand()
 {
-	if (parent())
-		parent()->forceAutoExpand();
+	if (tqparent())
+		tqparent()->forceAutoExpand();
 
 	if (!mUserOpened)
 		tree()->addAutoExpanded(this);
@@ -352,7 +352,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
 	{
 		if (match.length())
 		{
-			if (!text(0).contains(match, false))
+			if (!text(0).tqcontains(match, false))
 			{
 				setHidden(true);
 				return false;
@@ -367,7 +367,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
 
 		if (match.length())
 		{
-			visible = text(0).contains(match, false);
+			visible = text(0).tqcontains(match, false);
 		}
 
 		if (visible)
@@ -419,7 +419,7 @@ TreeItem *TreeItem::next()
 		{
 			if (upYours->nextSibling())
 				return upYours->nextSibling();
-			upYours = upYours->parent();
+			upYours = upYours->tqparent();
 		} while (upYours);
 	}
 	return 0;
@@ -431,8 +431,8 @@ TreeItem *TreeItem::next()
 
 
 
-Tree::Tree(Oblique *oblique, TQWidget *parent)
-	: KListView(parent), mOblique(oblique), mAutoExpanding(0)
+Tree::Tree(Oblique *oblique, TQWidget *tqparent)
+	: KListView(tqparent), mOblique(oblique), mAutoExpanding(0)
 {
 	mCurrent = 0;
 	lastMenu =0;
@@ -503,16 +503,16 @@ void Tree::clear()
 	KListView::clear();
 }
 
-void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme)
+void Tree::movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme)
 {
 	TQPtrList<TQListViewItem> items = selectedItems(true);
 	for (TQPtrList<TQListViewItem>::Iterator i(items.begin()); *i; ++i)
 	{
-		if ((*i)->parent() != parent)
+		if ((*i)->tqparent() != tqparent)
 			return;
 	}
 	
-	KListView::movableDropEvent(parent, afterme);
+	KListView::movableDropEvent(tqparent, afterme);
 }
 
 
@@ -535,7 +535,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &
 TreeItem *Tree::firstChild()
 	{ return static_cast<TreeItem*>(KListView::firstChild()); }
 
-TreeItem *Tree::find(File item)
+TreeItem *Tree::tqfind(File item)
 {
 	TreeItem *i = firstChild();
 
@@ -543,7 +543,7 @@ TreeItem *Tree::find(File item)
 	{
 		if (i->file() == item) return i;
 
-		TreeItem *found = i->find(item);
+		TreeItem *found = i->tqfind(item);
 		if (found) return found;
 
 		i = i->nextSibling();
@@ -551,19 +551,19 @@ TreeItem *Tree::find(File item)
 	return i;
 }
 
-void Tree::insert(TreeItem *replace, File file)
+void Tree::insert(TreeItem *tqreplace, File file)
 {
-	TreeItem *created = collate(replace, file);
-	if (mCurrent == replace)
+	TreeItem *created = collate(tqreplace, file);
+	if (mCurrent == tqreplace)
 	{
 		mCurrent = created;
-		repaintItem(created);
-		if (isSelected(replace))
+		tqrepaintItem(created);
+		if (isSelected(tqreplace))
 			setSelected(created, true);
 	}
-	if (created != replace)
+	if (created != tqreplace)
 	{
-		delete replace;
+		delete tqreplace;
 	}
 }
 
@@ -592,7 +592,7 @@ void Tree::checkRemove(Slice *slice, File f)
 
 void Tree::update(File file)
 {
-	if (TreeItem *item = find(file))
+	if (TreeItem *item = tqfind(file))
 	{
 		insert(item, file);
 	}
@@ -624,8 +624,8 @@ void Tree::setCurrent(TreeItem *cur)
 	mCurrent = cur;
 	TQPtrList<TreeItem> oldAutoExpanded = mAutoExpanded;
 	mAutoExpanded.clear();
-	repaintItem(old);
-	repaintItem(cur);
+	tqrepaintItem(old);
+	tqrepaintItem(cur);
 	if (cur) cur->autoExpand();
 
 	// do an anti-intersection on oldAutoUpdated and the new mAutoExpanded
@@ -750,36 +750,36 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree
 
 TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf)
 {
-	// search childOf's immediate children
-	TreeItem *children;
+	// search childOf's immediate tqchildren
+	TreeItem *tqchildren;
 	if (childOf)
-		children = childOf->firstChild();
+		tqchildren = childOf->firstChild();
 	else
-		children = firstChild();
+		tqchildren = firstChild();
 
 	TQString presentation = group->presentation(file);
-	while (children)
+	while (tqchildren)
 	{
 		// merging would be done here
 		bool matches=false;
 		if (group->fuzzyness(QueryGroup::Case))
 		{
-			matches = (children->text(0).lower() == presentation.lower());
+			matches = (tqchildren->text(0).lower() == presentation.lower());
 		}
 		else
 		{
-			matches = (children->text(0) == presentation);
+			matches = (tqchildren->text(0) == presentation);
 		}
 
-		matches = matches && !children->group()->option(QueryGroup::Playable);
+		matches = matches && !tqchildren->group()->option(QueryGroup::Playable);
 
 		if (matches)
 		{
-			children->setFile(File());
-			return children;
+			tqchildren->setFile(File());
+			return tqchildren;
 		}
 
-		children = children->nextSibling();
+		tqchildren = tqchildren->nextSibling();
 	}
 
 	TreeItem *item;
@@ -790,7 +790,7 @@ TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeIte
 	else if (fix)
 	{
 		item = fix;
-		if (fix->parent() != childOf)
+		if (fix->tqparent() != childOf)
 			moveItem(fix, childOf, 0);
 		item->setText(0, presentation);
 	}
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index f059931..8f92f2a 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -23,15 +23,15 @@ class TreeItem : public KListViewItem
 	bool mHidden:1;
 
 public:
-	TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p=0);
-	TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p=0);
+	TreeItem(Tree *tqparent, QueryGroup *group, const File &file, const TQString &p=0);
+	TreeItem(TreeItem *tqparent, QueryGroup *group, const File &file, const TQString &p=0);
 	~TreeItem();
 
 	QueryGroup *group() { return mGroup; }
 	const QueryGroup *group() const { return mGroup; }
 	void setGroup(QueryGroup *group) { mGroup = group; }
 
-	TreeItem *parent() { return static_cast<TreeItem*>(KListViewItem::parent()); }
+	TreeItem *tqparent() { return static_cast<TreeItem*>(KListViewItem::tqparent()); }
 	Tree *tree();
 	TreeItem *itemBelow() { return static_cast<TreeItem*>(KListViewItem::itemBelow()); }
 	TreeItem *firstChild() { return static_cast<TreeItem*>(KListViewItem::firstChild()); }
@@ -45,13 +45,13 @@ public:
 
 	void setOpen(bool o);
 
-	TreeItem *find(File item);
+	TreeItem *tqfind(File item);
 
 	bool playable() const;
 
 	/**
 	 * get the next item that is playable logically.
-	 * that is, if it has a File, and its parent hasn't a
+	 * that is, if it has a File, and its tqparent hasn't a
 	 * File
 	 **/
 	TreeItem *nextPlayable();
@@ -61,8 +61,8 @@ public:
 	virtual int compare(TQListViewItem * i, int col, bool) const;
 
 	/**
-	 * open my parents so that I'm visible, if I'm playing or
-	 * close my parents if I'm not playing, and the user
+	 * open my tqparents so that I'm visible, if I'm playing or
+	 * close my tqparents if I'm not playing, and the user
 	 * didn't open
 	 **/
 	void autoExpand();
@@ -86,6 +86,7 @@ class Loader;
 class Tree : public KListView
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 
 	Query mQuery;
@@ -103,10 +104,10 @@ Q_OBJECT
 	Loader *mLoader;
 
 public:
-	Tree(Oblique *oblique, TQWidget *parent=0);
+	Tree(Oblique *oblique, TQWidget *tqparent=0);
 	~Tree();
 	TreeItem *firstChild();
-	TreeItem *find(File item);
+	TreeItem *tqfind(File item);
 	TreeItem *current() { return mCurrent; }
 	Query *query() { return &mQuery; }
 	Oblique *oblique() { return mOblique; }
@@ -129,10 +130,10 @@ public:
 
 protected:
 	virtual TQDragObject *dragObject();
-	void movableDropEvent(TQListViewItem* parent, TQListViewItem* afterme);
+	void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
 
 public slots:
-	void insert(TreeItem *replace, File file);
+	void insert(TreeItem *tqreplace, File file);
 	void insert(File file);
 	void remove(File file);
 	void update(File file);
@@ -181,7 +182,7 @@ private:
 	TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf);
 
 	/**
-	 * remove the siblings and children of the treeitem
+	 * remove the siblings and tqchildren of the treeitem
 	 **/
 	void remove(TreeItem *, const File &file);
 
diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 8c7f81d..91d07c9 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -20,8 +20,8 @@
 class TabWidget : public KTabWidget
 {
 public:
-	TabWidget(TQWidget *parent)
-		: KTabWidget(parent)
+	TabWidget(TQWidget *tqparent)
+		: KTabWidget(tqparent)
 	{
 	}
 public:
@@ -42,9 +42,9 @@ View::View(Oblique *oblique)
 	setCentralWidget(mTabs);
 
 	KAction *ac;
-	ac = new KAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files");
+	ac = new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
 	ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection."));
-	ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
+	ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
 	
 	
 //	ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload");
@@ -52,31 +52,31 @@ View::View(Oblique *oblique)
 
 	ac = new SliceListAction(
 			i18n("&Slices"), oblique,
-			this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
+			TQT_TQOBJECT(this), TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
 		);
 	ac->setWhatsThis(i18n("Select a sub-collection to display"));
 
 	mSchemaListAction = new SchemaListAction(
-			i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
+			i18n("&Schemas"), TQT_TQOBJECT(this), TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
 		);
 	mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree."));
 
 	ac = new KAction(
-			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()),
+			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()),
 			actionCollection(), "newtab"
 		);
 
 	mRemoveTabAction = new KAction(
-			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()),
+			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()),
 			actionCollection(), "removecurrenttab"
 		);
 
 	{
 		TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget");
-		l->setBackgroundMode( Qt::PaletteButton );
-		l->setAlignment(
-				(TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
-					Qt::AlignVCenter | Qt::ShowPrefix
+		l->setBackgroundMode( TQt::PaletteButton );
+		l->tqsetAlignment(
+				(TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
+					TQt::AlignVCenter | TQt::ShowPrefix
 			);
 		l->adjustSize();
 		new KWidgetAction(l, i18n("&Jump:"), KShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label");
@@ -87,7 +87,7 @@ View::View(Oblique *oblique)
 		connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&)));
 	}
 
-	KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
+	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
 
 	applyMainWindowSettings(KGlobal::config(), "Oblique View");
 	createGUI("obliqueui.rc");
@@ -138,7 +138,7 @@ View::~View()
 		int slice = tree->slice()->id();
 		TQString query = tree->fileOfQuery();
 
-		TQString t = TQString("%1:%2").arg(slice).arg(query);
+		TQString t = TQString("%1:%2").tqarg(slice).tqarg(query);
 		tabids.append(t);
 	}
 	
@@ -241,8 +241,8 @@ void View::use(Slice *s)
 
 
 
-LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name)
-	: KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name)
+LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name)
+	: KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, tqparent, name)
 {
 	setAutoSized(true);
 }
diff --git a/noatun-plugins/oblique/view.h b/noatun-plugins/oblique/view.h
index bf216ea..4277d06 100644
--- a/noatun-plugins/oblique/view.h
+++ b/noatun-plugins/oblique/view.h
@@ -16,6 +16,7 @@ class TabWidget;
 class View : public KMainWindow
 {
 Q_OBJECT
+  TQ_OBJECT
 	Oblique *mOblique;
 	Tree *mTree;
 	TQValueList<Tree*> mTrees;
@@ -59,8 +60,9 @@ protected:
 class LineEditAction : public KWidgetAction
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name);
+	LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name);
 
 	KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); }
 	KLineEdit *lineEdit() { return widget(); }
diff --git a/noatun-plugins/pitchablespeed/Makefile.am b/noatun-plugins/pitchablespeed/Makefile.am
index b994d98..3879a35 100644
--- a/noatun-plugins/pitchablespeed/Makefile.am
+++ b/noatun-plugins/pitchablespeed/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(kde_includes)/arts $(all_includes)
+INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = noatunpitchablespeed.la
 noatunpitchablespeed_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.cpp b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
index b59d6e5..17d8e51 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.cpp
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.cpp
@@ -149,7 +149,7 @@ void PitchableSpeed::preserveFrequenciesChanged(bool preserveNow)
 void PitchableSpeed::init()
 {
 	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Speed Slider"),
-										 this, TQT_SLOT(toggle(void)));
+										 TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
 }
 
 void PitchableSpeed::toggle(void)
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.h b/noatun-plugins/pitchablespeed/pitchablespeed.h
index c5bfadf..7947bb1 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.h
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.h
@@ -21,6 +21,7 @@ class TQSlider;
 class PitchableSpeed : public SpeedTuner, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	PitchableSpeed();
diff --git a/noatun-plugins/pitchablespeed/pitchablespeed.plugin b/noatun-plugins/pitchablespeed/pitchablespeed.plugin
index 8b1dded..f29c92a 100644
--- a/noatun-plugins/pitchablespeed/pitchablespeed.plugin
+++ b/noatun-plugins/pitchablespeed/pitchablespeed.plugin
@@ -61,7 +61,7 @@ Comment[az]=Çalma sür'ətini bir qulp ilə dəyişdirmə imkanı verir
 Comment[bg]=Регулиране скоростта на изпълнение чрез плъзгач
 Comment[bs]=Omogućuje prilagođavanje brzine sviranja pomoću klizača
 Comment[ca]=Fa que es puga variar la velocitat de reproducció amb un cursor
-Comment[cs]=Umožní měnit rychlost přehrávání pomocí posuvníku
+Comment[cs]=Umožní měnit rychlost přehrávání potqmocí posuvníku
 Comment[cy]=Newid cyflymder chwarae efo llithrydd
 Comment[da]=Gør afspilningshastigheden indstillelig med en skyder
 Comment[de]=Macht die Abspielgeschwindigkeit mit einem Schieberegler einstellbar
@@ -98,7 +98,7 @@ Comment[pt]=Torna a velocidade de reprodução ajustável com uma barra
 Comment[pt_BR]=Torna a velocidade reprodução ajustável com uma barra deslizante
 Comment[ro]=Permite ajustarea vitezei de redare cu un potenţiometru
 Comment[ru]=Регулирование скорости проигрывания через бегунок
-Comment[sk]=Umožňuje zmeniť rýchlosť prehrávania pomocou posúvadla
+Comment[sk]=Umožňuje zmeniť rýchlosť prehrávania potqmocou posúvadla
 Comment[sl]=Naredi hitrost predvajanja prilagodljivo z drsnikom
 Comment[sr]=Чини брзину пуштања подесивом помоћу клизача
 Comment[sr@Latn]=Čini brzinu puštanja podesivom pomoću klizača
diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui
index 79844c4..e533bd2 100644
--- a/noatun-plugins/pitchablespeed/speedtuner.ui
+++ b/noatun-plugins/pitchablespeed/speedtuner.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>SpeedTuner</class>
 <author>Hans Meine &lt;hans@meine.de&gt;</author>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>SpeedTuner</cstring>
     </property>
@@ -26,7 +26,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QSlider">
+        <widget class="TQSlider">
             <property name="name">
                 <cstring>slider</cstring>
             </property>
@@ -37,7 +37,7 @@
                 <enum>Both</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -51,7 +51,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>currentValEdit</cstring>
                     </property>
@@ -68,7 +68,7 @@
                     <property name="frame">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignHCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -84,14 +84,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -105,7 +105,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>rangeLabel</cstring>
                             </property>
@@ -130,7 +130,7 @@
                                 <string>+/- </string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>offsetLabel</cstring>
                             </property>
@@ -154,7 +154,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>preserveFrequencies</cstring>
                     </property>
@@ -186,10 +186,10 @@
         <slot>offsetChanged(int)</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">speedChanged(int)</slot>
     <slot access="protected">offsetChanged(int)</slot>
     <slot access="protected">rangeChanged(int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am
index 27c35cc..d49c733 100644
--- a/noatun-plugins/synaescope/Makefile.am
+++ b/noatun-plugins/synaescope/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
 
 METASOURCES = AUTO
 
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index 5b881fd..296a541 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -30,14 +30,14 @@
 #include "cmodule.h"
 #include "synaescope.h"
 
-SynaePrefs::SynaePrefs(TQObject *parent)
-	: CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", parent)
+SynaePrefs::SynaePrefs(TQObject *tqparent)
+	: CModule(i18n("Synaescope"), i18n("Noatun Visualization"), "synaescope", tqparent)
 {
 // 	kdDebug(66666) << k_funcinfo << endl;
 	xRes = new TQSpinBox(320, 1024, 16, this);
 	yRes = new TQSpinBox(240, 768, 12, this);
 
-	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 
@@ -47,9 +47,9 @@ SynaePrefs::SynaePrefs(TQObject *parent)
 	yResLayout->addWidget(new TQLabel(i18n("Display height:"), this));
 	yResLayout->addWidget(yRes);
 
-	layout->addLayout(xResLayout);
-	layout->addLayout(yResLayout);
-	layout->addStretch();
+	tqlayout->addLayout(xResLayout);
+	tqlayout->addLayout(yResLayout);
+	tqlayout->addStretch();
 
 	changed=false;
 	connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges()));
diff --git a/noatun-plugins/synaescope/cmodule.h b/noatun-plugins/synaescope/cmodule.h
index c367ad2..8a39a67 100644
--- a/noatun-plugins/synaescope/cmodule.h
+++ b/noatun-plugins/synaescope/cmodule.h
@@ -27,9 +27,10 @@ class TQSpinBox;
 class SynaePrefs : public CModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		SynaePrefs(TQObject *parent);
+		SynaePrefs(TQObject *tqparent);
 
 		virtual void save();
 		virtual void reopen();
diff --git a/noatun-plugins/synaescope/synaescope.h b/noatun-plugins/synaescope/synaescope.h
index af1b6f5..df5417d 100644
--- a/noatun-plugins/synaescope/synaescope.h
+++ b/noatun-plugins/synaescope/synaescope.h
@@ -17,6 +17,7 @@ class KProcess;
 class SynaeScope : public TQObject, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	SynaeScope();
diff --git a/noatun-plugins/synaescope/ui.cpp b/noatun-plugins/synaescope/ui.cpp
index 2adc1f7..846a3b7 100644
--- a/noatun-plugins/synaescope/ui.cpp
+++ b/noatun-plugins/synaescope/ui.cpp
@@ -143,7 +143,7 @@ struct NoatunActionButton : public Button
 				action="";
 			}
 
-			if (action)
+			if (!action.isNull())
 			{
 				action+="()";
 				DCOPClient c;
@@ -257,14 +257,14 @@ struct SliderBar : public UIObject
 
 struct PopperUpper : public UIObject
 {
-	int maskAdd;
+	int tqmaskAdd;
 
 	PopperUpper(int _am,int _vm,double _x,double _y,
-			double _width,double _height, int _maskAdd)
+			double _width,double _height, int _tqmaskAdd)
 	{
 		activeMask = _am; visibleMask = _vm;
 		x = _x; y = _y; width = _width; height = _height;
-		maskAdd = _maskAdd;
+		tqmaskAdd = _tqmaskAdd;
 	}
 
 	int go(bool mouseDown,bool mouseClick, bool mouseOver,
@@ -282,7 +282,7 @@ struct PopperUpper : public UIObject
 				0x0200,
 				x*scale,y*scale,width*scale,height*scale);
 
-		return mouseOver ? maskAdd : 0;
+		return mouseOver ? tqmaskAdd : 0;
 	}
 
 	void handleKey(char key, int &action)
@@ -330,14 +330,14 @@ void Interface::setupPalette()
 #undef MAX
 }
 
-//Visible mask
+//Visible tqmask
 #define ALL 1
 #define BUTTONBAR 2
 #define TRACKBAR 4
 #define DIALBAR 8
 #define VOLUMEBAR 16
 
-//Active mask
+//Active tqmask
 //#define ALL 1
 #define PLAYING 2
 #define PAUSED 4
@@ -346,7 +346,7 @@ void Interface::setupPalette()
 #define OPEN 64
 
 
-// TODO Lay things out with parents and a stack, like QT
+// TODO Lay things out with tqparents and a stack, like QT
 Interface::Interface()
 {
 	static const float IconSize=0.2;
diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am
index b557d10..4a673cd 100644
--- a/noatun-plugins/tippercanoe/Makefile.am
+++ b/noatun-plugins/tippercanoe/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
 
 METASOURCES = AUTO
 
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index cf5cbfc..4a617ee 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -52,7 +52,7 @@ SynaeScope::~SynaeScope()
 void SynaeScope::init()
 {
 	connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(read(KProcess *, char *, int)));
-	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), this, TQT_SLOT(toggle(void)));
+	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
 
 	process << KStandardDirs::findExe("noatuntippecanoe.bin");
 
@@ -81,8 +81,8 @@ void SynaeScope::scopeEvent(float *left, float *right, int size)
 
 void SynaeScope::read(KProcess *, char *buf, int)
 {
-	TQString num = TQString::fromLatin1(buf);
-	num = num.left(num.find(TQRegExp("\\s")));
+	TQString num = TQString::tqfromLatin1(buf);
+	num = num.left(num.tqfind(TQRegExp("\\s")));
 	id = num.toInt();
 	embed->embed(id);
 }
diff --git a/noatun-plugins/tippercanoe/synaescope.h b/noatun-plugins/tippercanoe/synaescope.h
index 59daa93..4479c65 100644
--- a/noatun-plugins/tippercanoe/synaescope.h
+++ b/noatun-plugins/tippercanoe/synaescope.h
@@ -19,6 +19,7 @@
 class SynaeScope : public TQWidget, public StereoScope, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	SynaeScope();
diff --git a/noatun-plugins/tippercanoe/ui.cpp b/noatun-plugins/tippercanoe/ui.cpp
index e260d18..663816c 100644
--- a/noatun-plugins/tippercanoe/ui.cpp
+++ b/noatun-plugins/tippercanoe/ui.cpp
@@ -170,14 +170,14 @@ struct SliderBar : public UIObject
 
 struct PopperUpper : public UIObject
 {
-	int maskAdd;
+	int tqmaskAdd;
 
 	PopperUpper(int _am,int _vm,double _x,double _y,
-			double _width,double _height, int _maskAdd)
+			double _width,double _height, int _tqmaskAdd)
 	{
 		activeMask = _am; visibleMask = _vm; 
 		x = _x; y = _y; width = _width; height = _height;
-		maskAdd = _maskAdd;
+		tqmaskAdd = _tqmaskAdd;
 	}
 
 	int go(bool mouseDown,bool mouseClick, bool mouseOver,
@@ -195,7 +195,7 @@ struct PopperUpper : public UIObject
 				0x0200,
 				x*scale,y*scale,width*scale,height*scale);
 
-		return mouseOver ? maskAdd : 0;
+		return mouseOver ? tqmaskAdd : 0;
 	}
 
 	void handleKey(char key, int &action)
@@ -243,14 +243,14 @@ void Interface::setupPalette()
 #undef MAX
 }
 
-//Visible mask
+//Visible tqmask
 #define ALL 1
 #define BUTTONBAR 2
 #define TRACKBAR 4
 #define DIALBAR 8
 #define VOLUMEBAR 16
 
-//Active mask
+//Active tqmask
 //#define ALL 1
 #define PLAYING 2
 #define PAUSED 4
@@ -259,7 +259,7 @@ void Interface::setupPalette()
 #define OPEN 64 
 
 
-// TODO Lay things out with parents and a stack, like QT
+// TODO Lay things out with tqparents and a stack, like QT
 Interface::Interface()
 {
 	static const float IconSize=0.2;
diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am
index b42b7a0..c243d68 100644
--- a/noatun-plugins/tyler/Makefile.am
+++ b/noatun-plugins/tyler/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
 
 METASOURCES = AUTO
 
diff --git a/noatun-plugins/tyler/tyler.h b/noatun-plugins/tyler/tyler.h
index e919316..d6f540f 100644
--- a/noatun-plugins/tyler/tyler.h
+++ b/noatun-plugins/tyler/tyler.h
@@ -12,6 +12,7 @@
 class Tyler : public TQObject, public StereoScope, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Tyler();
diff --git a/noatun-plugins/wavecapture/Makefile.am b/noatun-plugins/wavecapture/Makefile.am
index 0ffa449..8073542 100644
--- a/noatun-plugins/wavecapture/Makefile.am
+++ b/noatun-plugins/wavecapture/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = -I$(kde_includes)/arts $(all_includes)
+INCLUDES = -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/kde -I$(kde_includes)/kde/arts
 kde_module_LTLIBRARIES = noatunwavecapture.la
 
 
diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h
index 7f92cfa..78cbc5f 100644
--- a/noatun-plugins/wavecapture/wavecapture.h
+++ b/noatun-plugins/wavecapture/wavecapture.h
@@ -31,6 +31,7 @@ namespace KIO { class Job; }
 class WaveCapture : public TQObject, public Plugin
 {
 Q_OBJECT
+  TQ_OBJECT
 NOATUNPLUGIND
 
 public:
@@ -55,8 +56,8 @@ private:
 	int pluginMenuItem;
 
 	bool _enabled;
-	enum Status { PAUSED, STOPPED, PLAYING };
-	Status _status;
+	enum tqStatus { PAUSED, STOPPED, PLAYING };
+	tqStatus _status;
 
 	Arts::Effect_WAVECAPTURE _capture;
 	int _count;