Replace Q_OBJECT with TQ_OBJECT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

258 files changed, 328 insertions, 328 deletions

diff --git a/arts/builder/execdlg.h b/arts/builder/execdlg.h
index a4c235be..6a85656d 100644
--- a/arts/builder/execdlg.h
+++ b/arts/builder/execdlg.h
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 
 class ExecDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	TQTimer *cpuusagetimer;
diff --git a/arts/builder/interfacedlg.h b/arts/builder/interfacedlg.h
index c2ee3341..efb8a9de 100644
--- a/arts/builder/interfacedlg.h
+++ b/arts/builder/interfacedlg.h
@@ -31,7 +31,7 @@
 #include <vector>
 
 class InterfaceDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	TQListBox *listbox;
diff --git a/arts/builder/main.h b/arts/builder/main.h
index 74408022..135e3bc4 100644
--- a/arts/builder/main.h
+++ b/arts/builder/main.h
@@ -39,7 +39,7 @@ class TDEToggleAction;
 
 class ArtsBuilderWindow: public KDockMainWindow
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 protected:
diff --git a/arts/builder/menumaker.h b/arts/builder/menumaker.h
index fa3c0c20..655a0764 100644
--- a/arts/builder/menumaker.h
+++ b/arts/builder/menumaker.h
@@ -10,7 +10,7 @@ class MenuMaker;
 
 class MenuEntry : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 protected:
@@ -46,7 +46,7 @@ public:
 
 class MenuMaker :public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 	std::list<MenuCategory *> categories;
diff --git a/arts/builder/mwidget.h b/arts/builder/mwidget.h
index 38d6999d..11fe76c0 100644
--- a/arts/builder/mwidget.h
+++ b/arts/builder/mwidget.h
@@ -33,7 +33,7 @@ class MWidgetTool;
 
 class ModuleWidget :public QtTableView, public StructureCanvas
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	friend class MWidgetTool;
 	friend class CreateTool;
diff --git a/arts/builder/portposdlg.h b/arts/builder/portposdlg.h
index b8714538..ba5ba8f9 100644
--- a/arts/builder/portposdlg.h
+++ b/arts/builder/portposdlg.h
@@ -31,7 +31,7 @@
 #include <vector>
 
 class PortPosDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	Structure *structure;
diff --git a/arts/builder/propertypanel.h b/arts/builder/propertypanel.h
index 9b74b275..af156fda 100644
--- a/arts/builder/propertypanel.h
+++ b/arts/builder/propertypanel.h
@@ -32,7 +32,7 @@ class ModulePort;
 
 class PropertyPanel: public PropertyPanelBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	
 public:
diff --git a/arts/builder/qttableview.h b/arts/builder/qttableview.h
index 8a8cbe3d..9a944432 100644
--- a/arts/builder/qttableview.h
+++ b/arts/builder/qttableview.h
@@ -25,7 +25,7 @@ class TQCornerSquare;
 
 class QtTableView : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     virtual void setBackgroundColor( const TQColor & );
diff --git a/arts/builder/retrievedlg.h b/arts/builder/retrievedlg.h
index 485298f0..065efe93 100644
--- a/arts/builder/retrievedlg.h
+++ b/arts/builder/retrievedlg.h
@@ -34,7 +34,7 @@
 #include <string>
 
 class RetrieveDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQListBox *listbox;
 public:
diff --git a/arts/gui/kde/dbtest.h b/arts/gui/kde/dbtest.h
index b78facd9..041cdff2 100644
--- a/arts/gui/kde/dbtest.h
+++ b/arts/gui/kde/dbtest.h
@@ -7,7 +7,7 @@
 #include "dbvolcalc.h"
 
 class dBTestWidget : public TQWidget, public dB2VolCalc {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	dBTestWidget( TQWidget*, const char* =0 );
diff --git a/arts/gui/kde/kbutton_impl.h b/arts/gui/kde/kbutton_impl.h
index 17bad4d2..22c4cf81 100644
--- a/arts/gui/kde/kbutton_impl.h
+++ b/arts/gui/kde/kbutton_impl.h
@@ -31,7 +31,7 @@
 namespace Arts {
 class KButton_impl;
 class KButtonMapper : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KButton_impl *impl;
 	TQPushButton * button;
diff --git a/arts/gui/kde/kcombobox_impl.h b/arts/gui/kde/kcombobox_impl.h
index 71f76123..e1b533ad 100644
--- a/arts/gui/kde/kcombobox_impl.h
+++ b/arts/gui/kde/kcombobox_impl.h
@@ -35,7 +35,7 @@ namespace Arts {
 
 class KComboBox_impl;
 class ComboBoxIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KComboBox_impl *impl;
 public:
diff --git a/arts/gui/kde/kfader.h b/arts/gui/kde/kfader.h
index 886f289a..84e4d371 100644
--- a/arts/gui/kde/kfader.h
+++ b/arts/gui/kde/kfader.h
@@ -27,7 +27,7 @@
 
 class KFader : public TQSlider
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	protected:
 		void init();
diff --git a/arts/gui/kde/kfader_impl.h b/arts/gui/kde/kfader_impl.h
index 7d227e14..5dd03f2a 100644
--- a/arts/gui/kde/kfader_impl.h
+++ b/arts/gui/kde/kfader_impl.h
@@ -36,7 +36,7 @@ namespace Arts {
 class KFader_impl;
 
 class FaderIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KFader_impl *impl;
 public:
diff --git a/arts/gui/kde/kgraph.h b/arts/gui/kde/kgraph.h
index 2bb64398..6da8247e 100644
--- a/arts/gui/kde/kgraph.h
+++ b/arts/gui/kde/kgraph.h
@@ -33,7 +33,7 @@ namespace Arts {
 class KGraphLine_impl;
 class KGraph : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 protected:
diff --git a/arts/gui/kde/klabel_impl.h b/arts/gui/kde/klabel_impl.h
index 3139431d..b27a4365 100644
--- a/arts/gui/kde/klabel_impl.h
+++ b/arts/gui/kde/klabel_impl.h
@@ -64,7 +64,7 @@ public:
 } // namespace
 
 class RotateLabel : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	RotateLabel( TQWidget*, const char* =0 );
diff --git a/arts/gui/kde/klayoutbox_impl.h b/arts/gui/kde/klayoutbox_impl.h
index 287c7583..976e89a2 100644
--- a/arts/gui/kde/klayoutbox_impl.h
+++ b/arts/gui/kde/klayoutbox_impl.h
@@ -79,7 +79,7 @@ public:
 } // namespace
 
 class KDE_EXPORT KLayoutBox_Separator : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLayoutBox_Separator( TQWidget*, const char* =0 );
@@ -89,7 +89,7 @@ public:
 };
 
 class KLayoutBox_Line : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	int _width, _space;
diff --git a/arts/gui/kde/klevelmeter_firebars.h b/arts/gui/kde/klevelmeter_firebars.h
index bbabef2f..04ecc3dc 100644
--- a/arts/gui/kde/klevelmeter_firebars.h
+++ b/arts/gui/kde/klevelmeter_firebars.h
@@ -27,7 +27,7 @@ class TQPixmap;
 class KLevelMeter_FireBars;
 
 class KLevelMeter_FireBars_private : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_FireBars_private( KLevelMeter_FireBars*, const char* );
@@ -40,7 +40,7 @@ private:
 };
 
 class KLevelMeter_FireBars : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_FireBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
diff --git a/arts/gui/kde/klevelmeter_linebars.h b/arts/gui/kde/klevelmeter_linebars.h
index 89caeb93..3a7def62 100644
--- a/arts/gui/kde/klevelmeter_linebars.h
+++ b/arts/gui/kde/klevelmeter_linebars.h
@@ -24,7 +24,7 @@
 #include "klevelmeter_template.h"
 
 class KLevelMeter_LineBars : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_LineBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
diff --git a/arts/gui/kde/klevelmeter_normalbars.h b/arts/gui/kde/klevelmeter_normalbars.h
index 7697d502..e0f1eebf 100644
--- a/arts/gui/kde/klevelmeter_normalbars.h
+++ b/arts/gui/kde/klevelmeter_normalbars.h
@@ -29,7 +29,7 @@ class Bar;
 class TQBoxLayout;
 
 class KLevelMeter_NormalBars : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_NormalBars( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=25, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
@@ -48,7 +48,7 @@ private:
 };
 
 class Bar : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	float _min, _max;
diff --git a/arts/gui/kde/klevelmeter_private.h b/arts/gui/kde/klevelmeter_private.h
index 531bbdfc..b7662cd7 100644
--- a/arts/gui/kde/klevelmeter_private.h
+++ b/arts/gui/kde/klevelmeter_private.h
@@ -30,7 +30,7 @@ class TQBoxLayout;
 class KArtsWidget;
 
 class KLevelMeter_Private : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	Arts::KLevelMeter_impl* _impl;
diff --git a/arts/gui/kde/klevelmeter_small.h b/arts/gui/kde/klevelmeter_small.h
index ba50a669..2fa67e68 100644
--- a/arts/gui/kde/klevelmeter_small.h
+++ b/arts/gui/kde/klevelmeter_small.h
@@ -24,7 +24,7 @@
 #include "klevelmeter_template.h"
 
 class KLevelMeter_Small : public KLevelMeter_Template {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KLevelMeter_Small( Arts::KLevelMeter_impl*, TQWidget* =0, long substyle=0, long count=0, Arts::Direction =Arts::BottomToTop, float _dbmin=-24, float _dbmax=6 );
diff --git a/arts/gui/kde/klevelmeter_template.h b/arts/gui/kde/klevelmeter_template.h
index abf8c4d2..655e4f75 100644
--- a/arts/gui/kde/klevelmeter_template.h
+++ b/arts/gui/kde/klevelmeter_template.h
@@ -30,7 +30,7 @@
 #include "klevelmeter_impl.h"
 
 class KLevelMeter_Template : public TQWidget, public dB2VolCalc {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	Arts::KLevelMeter_impl* _impl;
diff --git a/arts/gui/kde/klineedit_impl.h b/arts/gui/kde/klineedit_impl.h
index bc96569c..7ce88794 100644
--- a/arts/gui/kde/klineedit_impl.h
+++ b/arts/gui/kde/klineedit_impl.h
@@ -48,7 +48,7 @@ public:
 };
 
 class KLineEditStringMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KLineEdit_impl *impl;
 public:
diff --git a/arts/gui/kde/kpoti.h b/arts/gui/kde/kpoti.h
index 25696399..ad7be8f1 100644
--- a/arts/gui/kde/kpoti.h
+++ b/arts/gui/kde/kpoti.h
@@ -30,7 +30,7 @@ struct TQPotiData;
 
 class KPoti : public TQFrame, public TQRangeControl
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/arts/gui/kde/kpoti_impl.h b/arts/gui/kde/kpoti_impl.h
index 7e0ee083..e7d1d75b 100644
--- a/arts/gui/kde/kpoti_impl.h
+++ b/arts/gui/kde/kpoti_impl.h
@@ -35,7 +35,7 @@ namespace Arts {
 class KPoti_impl;
 
 class PotiIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KPoti_impl *impl;
 public:
diff --git a/arts/gui/kde/kspinbox_impl.h b/arts/gui/kde/kspinbox_impl.h
index df99de21..1369393a 100644
--- a/arts/gui/kde/kspinbox_impl.h
+++ b/arts/gui/kde/kspinbox_impl.h
@@ -34,7 +34,7 @@ namespace Arts {
 
 class KSpinBox_impl;
 class SpinBoxIntMapper :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	KSpinBox_impl *impl;
 public:
diff --git a/arts/gui/kde/ktickmarks_impl.h b/arts/gui/kde/ktickmarks_impl.h
index 84478142..498ad9f4 100644
--- a/arts/gui/kde/ktickmarks_impl.h
+++ b/arts/gui/kde/ktickmarks_impl.h
@@ -60,7 +60,7 @@ private:
 };
 
 class KTickmarks_Widget : public TQFrame, public dB2VolCalc {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	KTickmarks_impl* _impl;
diff --git a/arts/gui/kde/kvolumefader_impl.h b/arts/gui/kde/kvolumefader_impl.h
index e734bc3c..0604497f 100644
--- a/arts/gui/kde/kvolumefader_impl.h
+++ b/arts/gui/kde/kvolumefader_impl.h
@@ -68,7 +68,7 @@ class TDEPopupMenu;
 class TDEAction;
 
 class KVolumeFader_Widget : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	KVolumeFader_impl* _impl;
diff --git a/arts/gui/kde/kwidget_impl.h b/arts/gui/kde/kwidget_impl.h
index 1f75ae01..b0c74fa0 100644
--- a/arts/gui/kde/kwidget_impl.h
+++ b/arts/gui/kde/kwidget_impl.h
@@ -69,7 +69,7 @@ public:
 };
 
 class KWidgetGuard : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	KWidget_impl *impl;
diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h
index 1cd94aab..cfc9eb02 100644
--- a/arts/gui/kde/tdepopupbox_private.h
+++ b/arts/gui/kde/tdepopupbox_private.h
@@ -34,7 +34,7 @@ class TQBoxLayout;
 
 class TDEPopupBox_widget : public TQFrame
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	TDEPopupBox_widget( TQWidget* =0, const char* =0);
@@ -65,7 +65,7 @@ private:
 // See tdepopupbox_impl.h - The eventmapper isn't needed at present, but perhaps in the future...
 
 /*class TDEPopupBoxEventMapper : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	TDEPopupBoxEventMapper(  TDEPopupBox_widget *widget, Arts::TDEPopupBox_impl *impl )
@@ -80,7 +80,7 @@ private:
 #include <tqstyle.h>
 
 class HandleDrag : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	HandleDrag( TQWidget *parent, const char* name=0 ) : TQWidget( parent,name ) {}
@@ -110,7 +110,7 @@ static const char* const own_xpm[]    = { "5 5 2 1", "# c black", ". c None", "#
 #include <tqlayout.h>
 
 class ShowButton : public TQPushButton {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	TQBoxLayout::Direction _dir;
@@ -167,7 +167,7 @@ public:
 };
 
 class OwnButton : public TQPushButton {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	TQPixmap _pmown, _pminside;
@@ -206,7 +206,7 @@ public:
 
 class OwnWidget : public KArtsWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 	ShowButton *_b;
 public:
diff --git a/arts/modules/effects/kstereovolumecontrolgui_impl.h b/arts/modules/effects/kstereovolumecontrolgui_impl.h
index c9f76dd9..5f6da3be 100644
--- a/arts/modules/effects/kstereovolumecontrolgui_impl.h
+++ b/arts/modules/effects/kstereovolumecontrolgui_impl.h
@@ -80,7 +80,7 @@ private:
 #include <tqtimer.h>
 
 class KStereoVolumeControlGui_EventMapper : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	TQTimer* _timer;
diff --git a/arts/tools/artsactions.h b/arts/tools/artsactions.h
index b3005aa6..5bba632d 100644
--- a/arts/tools/artsactions.h
+++ b/arts/tools/artsactions.h
@@ -36,7 +36,7 @@ class MediaTypesView;
 
 class KDE_EXPORT ArtsActions : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	/**
diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h
index 515e4fb4..3e894870 100644
--- a/arts/tools/artscontrolapplet.h
+++ b/arts/tools/artscontrolapplet.h
@@ -30,7 +30,7 @@ class ArtsControlAppletPrivate;
 
 class ArtsControlApplet : public KPanelApplet
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	/**
diff --git a/arts/tools/artscontrolapplet_private.h b/arts/tools/artscontrolapplet_private.h
index ddf72023..54928a84 100644
--- a/arts/tools/artscontrolapplet_private.h
+++ b/arts/tools/artscontrolapplet_private.h
@@ -46,7 +46,7 @@
 class VolumeSlider;
 
 class KDE_EXPORT ArtsControlAppletPrivate : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	ArtsControlApplet *_parent;
diff --git a/arts/tools/audiomanager.h b/arts/tools/audiomanager.h
index d787cf37..1378e702 100644
--- a/arts/tools/audiomanager.h
+++ b/arts/tools/audiomanager.h
@@ -36,7 +36,7 @@ class TQBoxLayout;
 
 class Gui_AUDIO_MANAGER : public Template_ArtsView
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	TQWidget *ParentWidget;
@@ -59,7 +59,7 @@ public slots:
 };
 
 class GuiAudioManagerProxy :public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
   
 	Gui_AUDIO_MANAGER *gim;
 public:
diff --git a/arts/tools/choosebusdlg.h b/arts/tools/choosebusdlg.h
index 7b6c923f..7282811e 100644
--- a/arts/tools/choosebusdlg.h
+++ b/arts/tools/choosebusdlg.h
@@ -29,7 +29,7 @@ class KLineEdit;
 class TQPushButton;
 
 class ChooseBusDlg :public KDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQListBox *listbox;
 	KLineEdit * lineedit;
diff --git a/arts/tools/environmentview.h b/arts/tools/environmentview.h
index 792ae2f8..a0c2b578 100644
--- a/arts/tools/environmentview.h
+++ b/arts/tools/environmentview.h
@@ -32,7 +32,7 @@ class TQListBoxItem;
 class TDEListBox;
 
 class EnvironmentView : public Template_ArtsView {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	Arts::Environment::Container container;
diff --git a/arts/tools/fftscopeview.h b/arts/tools/fftscopeview.h
index 3c6e79dd..0a0a93cb 100644
--- a/arts/tools/fftscopeview.h
+++ b/arts/tools/fftscopeview.h
@@ -39,7 +39,7 @@ class KArtsWidget;
 class ArtsActions;
 
 class KDE_EXPORT FFTScopeView : public Template_ArtsView {
-   Q_OBJECT
+   TQ_OBJECT
   
 protected:
 	Arts::StereoFFTScope scopefx;
diff --git a/arts/tools/levelmeters.h b/arts/tools/levelmeters.h
index 475a096a..24b0c374 100644
--- a/arts/tools/levelmeters.h
+++ b/arts/tools/levelmeters.h
@@ -43,7 +43,7 @@ inline float DBToLevel(float db) {
  * Base class for a single volume / value bar.
  */
 class ACLevelMeter : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	ACLevelMeter(TQWidget *parent): TQFrame(parent) {}
@@ -55,7 +55,7 @@ public slots:
  * Base class for a pair of volume / value bars.
  */
 class StereoLevelMeter : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	StereoLevelMeter(TQWidget *parent): TQFrame(parent) {}
@@ -68,7 +68,7 @@ public slots:
  * milliseconds and displays a full bar with optional max/min markers.
  */
 class PeakBar : public ACLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 	bool clipped;
 
@@ -104,7 +104,7 @@ public:
  * Special class which draws the Db scale with ticks, numbers and so on.
  */
 class ScaleView : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	TQFont font;
@@ -124,7 +124,7 @@ public:
  * options like Db range, whether minimal values are also shown and others.
  */
 class PeakLevelMeters : public StereoLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	int dbRange;
@@ -147,7 +147,7 @@ class KLed;
  * case it's all blue. (Original artscontrol widget by stw.)
  */
 class LedMeter : public ACLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	KLed *leds[12];
@@ -161,7 +161,7 @@ public:
  * A simple pair of LedMeters.
  */
 class StereoLedMeters : public StereoLevelMeter {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	LedMeter left, right;
diff --git a/arts/tools/main.h b/arts/tools/main.h
index ef349216..13496756 100644
--- a/arts/tools/main.h
+++ b/arts/tools/main.h
@@ -48,7 +48,7 @@ class PeakLevelMeter;
 class VScale;
 
 class FreeVerbView : public TQWidget {
-	Q_OBJECT
+	TQ_OBJECT
 	
 protected:
 	Arts::Synth_FREEVERB freeverb;
@@ -66,7 +66,7 @@ signals:
 class KArtsWidget;
 
 class VControl : public TQFrame {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	class StereoLevelMeter *stereoMeter;
@@ -92,7 +92,7 @@ private slots:
 #include "artsactions.h"
 
 class MainWindow : public TDEMainWindow {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	VControl *vc;
diff --git a/arts/tools/mediatypesview.h b/arts/tools/mediatypesview.h
index 44cfb95a..4c7e4d63 100644
--- a/arts/tools/mediatypesview.h
+++ b/arts/tools/mediatypesview.h
@@ -27,7 +27,7 @@
 #include "templateview.h"
 
 class MediaTypesView : public Template_ArtsView {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MediaTypesView( TQWidget* =0, const char* =0 );
diff --git a/arts/tools/midiinstdlg.h b/arts/tools/midiinstdlg.h
index 5fecce3f..03f08de7 100644
--- a/arts/tools/midiinstdlg.h
+++ b/arts/tools/midiinstdlg.h
@@ -27,7 +27,7 @@
 #include <tqcstring.h>
 
 class MidiInstDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQComboBox *box;
 public:
diff --git a/arts/tools/midimanagerview.h b/arts/tools/midimanagerview.h
index e5cd1467..eec8d0b0 100644
--- a/arts/tools/midimanagerview.h
+++ b/arts/tools/midimanagerview.h
@@ -35,7 +35,7 @@ class MidiManagerItem;
 class MidiManagerWidget;
 
 class MidiManagerView : public TDEMainWindow {
-	Q_OBJECT
+	TQ_OBJECT
   
 protected:
 	friend class ConnectionWidget;
diff --git a/arts/tools/midiportdlg.h b/arts/tools/midiportdlg.h
index e34bc37e..3189e942 100644
--- a/arts/tools/midiportdlg.h
+++ b/arts/tools/midiportdlg.h
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 
 class MidiPortDlg :public TQDialog {
-	Q_OBJECT
+	TQ_OBJECT
   
 	TQLineEdit *edit;
 public:
diff --git a/arts/tools/statusview.h b/arts/tools/statusview.h
index a0969ad4..c970e0a6 100644
--- a/arts/tools/statusview.h
+++ b/arts/tools/statusview.h
@@ -34,7 +34,7 @@ class TQTimer;
 class TQLabel;
 
 class ArtsStatusView : public Template_ArtsView {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	ArtsStatusView(Arts::SoundServer server, TQWidget* =0, const char* =0 );
diff --git a/arts/tools/templateview.h b/arts/tools/templateview.h
index 30269533..9b1124bb 100644
--- a/arts/tools/templateview.h
+++ b/arts/tools/templateview.h
@@ -26,7 +26,7 @@
 
 class Template_ArtsView : public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	Template_ArtsView( TQWidget* =0, const char* =0 );
diff --git a/juk/advancedsearchdialog.h b/juk/advancedsearchdialog.h
index 76c6f7be..11069273 100644
--- a/juk/advancedsearchdialog.h
+++ b/juk/advancedsearchdialog.h
@@ -26,7 +26,7 @@ class SearchLine;
 
 class AdvancedSearchDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/akodeplayer.h b/juk/akodeplayer.h
index 5e55c906..8805f786 100644
--- a/juk/akodeplayer.h
+++ b/juk/akodeplayer.h
@@ -36,7 +36,7 @@ namespace aKode {
 
 class KDE_EXPORT aKodePlayer : public Player
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/artsplayer.h b/juk/artsplayer.h
index 25fb232f..02b5edf6 100644
--- a/juk/artsplayer.h
+++ b/juk/artsplayer.h
@@ -46,7 +46,7 @@ namespace KDE {
 
 class ArtsPlayer : public Player
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/collectionlist.h b/juk/collectionlist.h
index 2a835c10..d01463ac 100644
--- a/juk/collectionlist.h
+++ b/juk/collectionlist.h
@@ -63,7 +63,7 @@ class CollectionList : public Playlist
 {
     friend class CollectionListItem;
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public: 
diff --git a/juk/coverdialog.h b/juk/coverdialog.h
index 95589350..00df8d64 100644
--- a/juk/coverdialog.h
+++ b/juk/coverdialog.h
@@ -20,7 +20,7 @@
 
 class CoverDialog : public CoverDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     CoverDialog(TQWidget *parent);
diff --git a/juk/deletedialog.h b/juk/deletedialog.h
index 522ee210..a5e1fbd3 100644
--- a/juk/deletedialog.h
+++ b/juk/deletedialog.h
@@ -28,7 +28,7 @@ class TQWidgetStack;
 
 class DeleteWidget : public DeleteDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -42,7 +42,7 @@ protected slots:
 
 class DeleteDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/directorylist.h b/juk/directorylist.h
index 4c1ebcef..c780b59b 100644
--- a/juk/directorylist.h
+++ b/juk/directorylist.h
@@ -21,7 +21,7 @@ class DirectoryListBase;
 
 class DirectoryList : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/dynamicplaylist.h b/juk/dynamicplaylist.h
index 3f03d365..ead7851c 100644
--- a/juk/dynamicplaylist.h
+++ b/juk/dynamicplaylist.h
@@ -24,7 +24,7 @@
 
 class DynamicPlaylist : public Playlist
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     /**
diff --git a/juk/exampleoptions.h b/juk/exampleoptions.h
index a161f95b..8228c9e2 100644
--- a/juk/exampleoptions.h
+++ b/juk/exampleoptions.h
@@ -21,7 +21,7 @@
 
 class ExampleOptions : public ExampleOptionsBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
     ExampleOptions(TQWidget *parent);
@@ -36,7 +36,7 @@ class ExampleOptions : public ExampleOptionsBase
 // buttons to close it.  It's just a little floating dialog.
 class ExampleOptionsDialog : public TQDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
     ExampleOptionsDialog(TQWidget *parent);
diff --git a/juk/filerenamer.h b/juk/filerenamer.h
index fbbc1a73..77275c53 100644
--- a/juk/filerenamer.h
+++ b/juk/filerenamer.h
@@ -139,7 +139,7 @@ private:
  */
 class FileRenamerWidget : public FileRenamerBase, public CategoryReaderInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/filerenamerconfigdlg.h b/juk/filerenamerconfigdlg.h
index 3ae4d762..3a43e6fa 100644
--- a/juk/filerenamerconfigdlg.h
+++ b/juk/filerenamerconfigdlg.h
@@ -22,7 +22,7 @@ class FileRenamerWidget;
 
 class FileRenamerConfigDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
     FileRenamerConfigDlg(TQWidget *parent);
diff --git a/juk/filerenameroptions.h b/juk/filerenameroptions.h
index 9e82394b..82cc1584 100644
--- a/juk/filerenameroptions.h
+++ b/juk/filerenameroptions.h
@@ -27,7 +27,7 @@
  */
 class FileRenamerTagOptions : public FileRenamerTagOptionsBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -51,7 +51,7 @@ class FileRenamerTagOptions : public FileRenamerTagOptionsBase
  */
 class TagOptionsDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/juk/folderplaylist.h b/juk/folderplaylist.h
index a25ffb53..495625dc 100644
--- a/juk/folderplaylist.h
+++ b/juk/folderplaylist.h
@@ -19,7 +19,7 @@
 
 class FolderPlaylist : public Playlist
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/gstreamerplayer.h b/juk/gstreamerplayer.h
index ef18785c..d133d27e 100644
--- a/juk/gstreamerplayer.h
+++ b/juk/gstreamerplayer.h
@@ -30,7 +30,7 @@
 
 class GStreamerPlayer : public Player
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/historyplaylist.h b/juk/historyplaylist.h
index 2968f846..2b1e5c2e 100644
--- a/juk/historyplaylist.h
+++ b/juk/historyplaylist.h
@@ -36,7 +36,7 @@ private:
 
 class HistoryPlaylist : public Playlist
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/juk.h b/juk/juk.h
index 629019a1..9dfb4910 100644
--- a/juk/juk.h
+++ b/juk/juk.h
@@ -36,7 +36,7 @@ class PlaylistSplitter;
 
 class JuK : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/k3bexporter.h b/juk/k3bexporter.h
index ce4c6bf8..89337038 100644
--- a/juk/k3bexporter.h
+++ b/juk/k3bexporter.h
@@ -29,7 +29,7 @@ class PlaylistAction;
  */
 class K3bExporter : public PlaylistExporter
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -77,7 +77,7 @@ private:
  */
 class K3bPlaylistExporter : public K3bExporter
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     K3bPlaylistExporter(PlaylistBox *parent = 0);
diff --git a/juk/keydialog.h b/juk/keydialog.h
index a974598b..b23eff8f 100644
--- a/juk/keydialog.h
+++ b/juk/keydialog.h
@@ -25,7 +25,7 @@
 
 class KeyDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/nowplaying.h b/juk/nowplaying.h
index 60d040e2..0fc57f07 100644
--- a/juk/nowplaying.h
+++ b/juk/nowplaying.h
@@ -39,7 +39,7 @@ class Playlist;
 
 class NowPlaying : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -126,7 +126,7 @@ public:
 
 class TrackItem : public TQWidget, public NowPlayingItem
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -148,7 +148,7 @@ private:
 
 class HistoryItem : public LinkLabel, public NowPlayingItem
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/playermanager.h b/juk/playermanager.h
index e8f6e528..3c722338 100644
--- a/juk/playermanager.h
+++ b/juk/playermanager.h
@@ -32,7 +32,7 @@ class PlaylistInterface;
 
 class PlayerManager : public Player, public PlayerIface
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 protected:
diff --git a/juk/playlist.h b/juk/playlist.h
index e06744b3..2425b760 100644
--- a/juk/playlist.h
+++ b/juk/playlist.h
@@ -45,7 +45,7 @@ typedef TQValueList<PlaylistItem *> PlaylistItemList;
 
 class Playlist : public TDEListView, public PlaylistInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/playlistbox.h b/juk/playlistbox.h
index d8169714..4bcd82f9 100644
--- a/juk/playlistbox.h
+++ b/juk/playlistbox.h
@@ -40,7 +40,7 @@ typedef TQValueList<Playlist *> PlaylistList;
 
 class PlaylistBox : public TDEListView, public PlaylistCollection
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public: 
@@ -141,7 +141,7 @@ class PlaylistBox::Item : public TQObject, public TDEListViewItem
     friend class CompactViewMode;
     friend class TreeViewMode;
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
     // moc won't let me create private TQObject subclasses and TQt won't let me
diff --git a/juk/playlistcollection.h b/juk/playlistcollection.h
index e5bf42e0..997972dc 100644
--- a/juk/playlistcollection.h
+++ b/juk/playlistcollection.h
@@ -209,7 +209,7 @@ private:
 
 class PlaylistCollection::ActionHandler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ActionHandler(PlaylistCollection *collection);
diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h
index 8c6216ac..914bad4b 100644
--- a/juk/playlistsplitter.h
+++ b/juk/playlistsplitter.h
@@ -40,7 +40,7 @@ class TagEditor;
 
 class PlaylistSplitter : public TQSplitter
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/searchplaylist.h b/juk/searchplaylist.h
index c40748c3..8bfbc216 100644
--- a/juk/searchplaylist.h
+++ b/juk/searchplaylist.h
@@ -20,7 +20,7 @@
 
 class SearchPlaylist : public DynamicPlaylist
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     SearchPlaylist(PlaylistCollection *collection,
diff --git a/juk/searchwidget.h b/juk/searchwidget.h
index 47354dae..a1d0a306 100644
--- a/juk/searchwidget.h
+++ b/juk/searchwidget.h
@@ -34,7 +34,7 @@ class Playlist;
 
 class SearchLine : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -72,7 +72,7 @@ private:
 
 class SearchWidget : public TDEToolBar, public SearchIface
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/slideraction.h b/juk/slideraction.h
index 1c38c0a5..78db9117 100644
--- a/juk/slideraction.h
+++ b/juk/slideraction.h
@@ -24,7 +24,7 @@ class TQDockWindow;
 
 class VolumeSlider : public TQSlider
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -48,7 +48,7 @@ private slots:
 
 class SliderAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/statuslabel.h b/juk/statuslabel.h
index a5f0bbff..9d9657a5 100644
--- a/juk/statuslabel.h
+++ b/juk/statuslabel.h
@@ -27,7 +27,7 @@ class FileHandle;
 
 class StatusLabel : public TQHBox, public PlaylistObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/systemtray.h b/juk/systemtray.h
index 7a8994cc..469cf9ee 100644
--- a/juk/systemtray.h
+++ b/juk/systemtray.h
@@ -37,7 +37,7 @@ class FileHandle;
  */
 class PassiveInfo : public KPassivePopup
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     PassiveInfo(TQWidget *parent = 0, const char *name = 0);
@@ -64,7 +64,7 @@ private:
 
 class SystemTray : public KSystemTray
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/tageditor.h b/juk/tageditor.h
index ee62c7b2..14cc9c67 100644
--- a/juk/tageditor.h
+++ b/juk/tageditor.h
@@ -36,7 +36,7 @@ class CollectionObserver;
 
 class TagEditor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public: 
diff --git a/juk/tagguesserconfigdlg.h b/juk/tagguesserconfigdlg.h
index cbb56845..ef0bca01 100644
--- a/juk/tagguesserconfigdlg.h
+++ b/juk/tagguesserconfigdlg.h
@@ -16,7 +16,7 @@ class TQListViewItem;
 class TagGuesserConfigDlgWidget;
 class TagGuesserConfigDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         TagGuesserConfigDlg(TQWidget *parent, const char *name = 0);
diff --git a/juk/tagtransactionmanager.h b/juk/tagtransactionmanager.h
index 81520bd4..0e169bba 100644
--- a/juk/tagtransactionmanager.h
+++ b/juk/tagtransactionmanager.h
@@ -105,7 +105,7 @@ typedef TQValueList<TagTransactionAtom> TagAlterationList;
  */
 class TagTransactionManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/juk/trackpickerdialog.h b/juk/trackpickerdialog.h
index ff2912e2..4fd2b1fb 100644
--- a/juk/trackpickerdialog.h
+++ b/juk/trackpickerdialog.h
@@ -28,7 +28,7 @@ class TrackPickerDialogBase;
 
 class TrackPickerDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/tracksequencemanager.h b/juk/tracksequencemanager.h
index d8cd1b47..898868ba 100644
--- a/juk/tracksequencemanager.h
+++ b/juk/tracksequencemanager.h
@@ -35,7 +35,7 @@ class Playlist;
  */
 class TrackSequenceManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/treeviewitemplaylist.h b/juk/treeviewitemplaylist.h
index bc1815e4..3dd4c803 100644
--- a/juk/treeviewitemplaylist.h
+++ b/juk/treeviewitemplaylist.h
@@ -23,7 +23,7 @@ class TQStringList;
 
 class TreeViewItemPlaylist : public SearchPlaylist
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/viewmode.h b/juk/viewmode.h
index cf260204..3852decb 100644
--- a/juk/viewmode.h
+++ b/juk/viewmode.h
@@ -28,7 +28,7 @@ class SearchPlaylist;
 
 class ViewMode : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -120,7 +120,7 @@ class TreeViewItemPlaylist;
 
 class TreeViewMode : public CompactViewMode
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -150,7 +150,7 @@ private:
 
 class CoverManagerMode : public ViewMode
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/webimagefetcher.h b/juk/webimagefetcher.h
index 26eefe60..32dbdbc2 100644
--- a/juk/webimagefetcher.h
+++ b/juk/webimagefetcher.h
@@ -54,7 +54,7 @@ typedef TQValueList<WebImage> WebImageList;
 
 class WebImageFetcher : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h
index afe2cd18..5d34a614 100644
--- a/juk/webimagefetcherdialog.h
+++ b/juk/webimagefetcherdialog.h
@@ -26,7 +26,7 @@ class KURL;
 
 class WebImageFetcherDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -73,7 +73,7 @@ namespace TDEIO
 
 class CoverIconViewItem : public TQObject, public TDEIconViewItem
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kaboodle/conf.h b/kaboodle/conf.h
index 06699db0..59c0d3bd 100644
--- a/kaboodle/conf.h
+++ b/kaboodle/conf.h
@@ -35,7 +35,7 @@ namespace Kaboodle
 
 class Conf : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/kaboodle/controls.h b/kaboodle/controls.h
index 307281e4..73916b6e 100644
--- a/kaboodle/controls.h
+++ b/kaboodle/controls.h
@@ -42,7 +42,7 @@ namespace Kaboodle
  **/
 class L33tSlider : public TQSlider
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	L33tSlider(TQWidget * parent, const char * name=0);
@@ -73,7 +73,7 @@ private:
  **/
 class SliderAction : public TDEAction
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	SliderAction(const TQString& text, int accel, const TQObject *receiver,
diff --git a/kaboodle/engine.h b/kaboodle/engine.h
index 974a8541..ccd5c6ba 100644
--- a/kaboodle/engine.h
+++ b/kaboodle/engine.h
@@ -44,7 +44,7 @@ namespace Kaboodle
  **/
 class Engine : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h
index cca5591b..917429b7 100644
--- a/kaboodle/kaboodle_factory.h
+++ b/kaboodle/kaboodle_factory.h
@@ -34,7 +34,7 @@ class Player;
 
 class KaboodleFactory : public KParts::Factory
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/kaboodle/kaboodleapp.h b/kaboodle/kaboodleapp.h
index c248b91f..1872d72a 100644
--- a/kaboodle/kaboodleapp.h
+++ b/kaboodle/kaboodleapp.h
@@ -32,7 +32,7 @@ class UserInterface;
 
 class KaboodleApp : public TDEApplication
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/kaboodle/player.h b/kaboodle/player.h
index b528fa9d..f9379c56 100644
--- a/kaboodle/player.h
+++ b/kaboodle/player.h
@@ -42,7 +42,7 @@ class View;
 
 class BrowserExtension : public KParts::BrowserExtension
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
@@ -51,7 +51,7 @@ public:
 
 class Player : public KMediaPlayer::Player
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h
index d82186a4..816941e7 100644
--- a/kaboodle/userinterface.h
+++ b/kaboodle/userinterface.h
@@ -41,7 +41,7 @@ namespace Kaboodle
  */
 class UserInterface : public KParts::MainWindow
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	UserInterface(TQWidget *parent, const KURL &initialFile = KURL());
diff --git a/kaboodle/view.h b/kaboodle/view.h
index 9b4e8fba..c5003980 100644
--- a/kaboodle/view.h
+++ b/kaboodle/view.h
@@ -44,7 +44,7 @@ namespace Kaboodle
 {
 class View : public KMediaPlayer::View
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/kaudiocreator/encodefileimp.h b/kaudiocreator/encodefileimp.h
index 1a3cd21c..f7ffff87 100644
--- a/kaudiocreator/encodefileimp.h
+++ b/kaudiocreator/encodefileimp.h
@@ -32,7 +32,7 @@ class Job;
  */
 class EncodeFileImp : public EncodeFile  {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/kaudiocreator/encoder.h b/kaudiocreator/encoder.h
index b891e0b5..fdc7bb53 100644
--- a/kaudiocreator/encoder.h
+++ b/kaudiocreator/encoder.h
@@ -32,7 +32,7 @@ class EncoderPrefs;
 
 class Encoder : public TQObject {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/kaudiocreator/encoderconfigimp.h b/kaudiocreator/encoderconfigimp.h
index f53a3426..dce1c111 100644
--- a/kaudiocreator/encoderconfigimp.h
+++ b/kaudiocreator/encoderconfigimp.h
@@ -31,7 +31,7 @@
  */
 class EncoderConfigImp : public EncoderConfig {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/kaudiocreator/jobqueimp.h b/kaudiocreator/jobqueimp.h
index 70aa7b40..22afd601 100644
--- a/kaudiocreator/jobqueimp.h
+++ b/kaudiocreator/jobqueimp.h
@@ -48,7 +48,7 @@ public:
 
 class JobQueImp : public JobQue {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h
index e85ec4ab..a31280c2 100644
--- a/kaudiocreator/kaudiocreator.h
+++ b/kaudiocreator/kaudiocreator.h
@@ -35,7 +35,7 @@ class TDEPopupMenu;
 
 class KAudioCreator : public TDEMainWindow {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
@@ -67,7 +67,7 @@ private:
 };
 
 class SettingsDialog: public TDEConfigDialog {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h
index 1d79c0e8..78d2234f 100644
--- a/kaudiocreator/ripper.h
+++ b/kaudiocreator/ripper.h
@@ -30,7 +30,7 @@ class Job;
 
 class Ripper : public TQObject {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h
index 72c33396..e25b6fa7 100644
--- a/kaudiocreator/tracksimp.h
+++ b/kaudiocreator/tracksimp.h
@@ -85,7 +85,7 @@ private:
  */
 class TracksImp : public Tracks {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/kmix/KMixApp.h b/kmix/KMixApp.h
index 7630e1f8..b3698f56 100644
--- a/kmix/KMixApp.h
+++ b/kmix/KMixApp.h
@@ -7,7 +7,7 @@ class KMixWindow;
 
 class KMixApp : public KUniqueApplication
 {
-Q_OBJECT
+TQ_OBJECT
   
  public:
     KMixApp();
diff --git a/kmix/dialogselectmaster.h b/kmix/dialogselectmaster.h
index ea26798a..53f83419 100644
--- a/kmix/dialogselectmaster.h
+++ b/kmix/dialogselectmaster.h
@@ -15,7 +15,7 @@ class Mixer;
 
 class DialogSelectMaster : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
  public:
     DialogSelectMaster(Mixer *mixer);
diff --git a/kmix/dialogviewconfiguration.h b/kmix/dialogviewconfiguration.h
index ce228f52..0ad6d319 100644
--- a/kmix/dialogviewconfiguration.h
+++ b/kmix/dialogviewconfiguration.h
@@ -12,7 +12,7 @@ class TQVBoxLayout;
 
 class DialogViewConfiguration : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
  public:
     DialogViewConfiguration(TQWidget* parent, ViewBase& view);
diff --git a/kmix/kledbutton.h b/kmix/kledbutton.h
index 0be42783..a2bafdec 100644
--- a/kmix/kledbutton.h
+++ b/kmix/kledbutton.h
@@ -31,7 +31,7 @@
   */
 
 class KLedButton : public KLed  {
-   Q_OBJECT
+   TQ_OBJECT
   
   public: 
    KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
diff --git a/kmix/kmix.h b/kmix/kmix.h
index 1dbd0321..602102b5 100644
--- a/kmix/kmix.h
+++ b/kmix/kmix.h
@@ -53,7 +53,7 @@ class Mixer;
 class 
 KMixWindow : public TDEMainWindow, virtual public KMixIface
 {
-   Q_OBJECT
+   TQ_OBJECT
 
   public:
    KMixWindow();
diff --git a/kmix/kmixapplet.h b/kmix/kmixapplet.h
index fea63cf7..e2f6c207 100644
--- a/kmix/kmixapplet.h
+++ b/kmix/kmixapplet.h
@@ -42,7 +42,7 @@ class KMixApplet;
 
 class AppletConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
    AppletConfigDialog( TQWidget * parent=0, const char * name=0 );
@@ -70,7 +70,7 @@ class AppletConfigDialog : public KDialogBase
 
 class KMixApplet : public KPanelApplet
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
 public:
diff --git a/kmix/kmixdockwidget.h b/kmix/kmixdockwidget.h
index 19c60ff3..a7b420a0 100644
--- a/kmix/kmixdockwidget.h
+++ b/kmix/kmixdockwidget.h
@@ -38,7 +38,7 @@ class ViewDockAreaPopup;
 class Volume;
 
 class KMixDockWidget : public KSystemTray  {
-   Q_OBJECT
+   TQ_OBJECT
   
    friend class KMixWindow;
 
diff --git a/kmix/kmixerwidget.h b/kmix/kmixerwidget.h
index e07808b6..073a6a88 100644
--- a/kmix/kmixerwidget.h
+++ b/kmix/kmixerwidget.h
@@ -58,7 +58,7 @@ class ViewSurround;
 
 class KMixerWidget : public TQWidget  
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
   public:
diff --git a/kmix/ksmallslider.h b/kmix/ksmallslider.h
index e0074d50..2729cf15 100644
--- a/kmix/ksmallslider.h
+++ b/kmix/ksmallslider.h
@@ -30,7 +30,7 @@
 
 class KSmallSlider : public TQWidget, public TQRangeControl
 {
-      Q_OBJECT
+      TQ_OBJECT
   
 
    public:
diff --git a/kmix/mdwenum.h b/kmix/mdwenum.h
index eb681441..8a1c972b 100644
--- a/kmix/mdwenum.h
+++ b/kmix/mdwenum.h
@@ -40,7 +40,7 @@ class ViewBase;
 
 class MDWEnum : public MixDeviceWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kmix/mdwslider.h b/kmix/mdwslider.h
index 0a6e8b56..fcd3636b 100644
--- a/kmix/mdwslider.h
+++ b/kmix/mdwslider.h
@@ -54,7 +54,7 @@ class ViewBase;
 
 class MDWSlider : public MixDeviceWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kmix/mdwswitch.h b/kmix/mdwswitch.h
index fafe043d..8be74e95 100644
--- a/kmix/mdwswitch.h
+++ b/kmix/mdwswitch.h
@@ -50,7 +50,7 @@ class ViewBase;
 
 class MDWSwitch : public MixDeviceWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h
index cc048a62..3a719e5d 100644
--- a/kmix/mixdevice.h
+++ b/kmix/mixdevice.h
@@ -18,7 +18,7 @@
  */
 class MixDevice : public TQObject
 {
-     Q_OBJECT
+     TQ_OBJECT
   
 
    public:
diff --git a/kmix/mixdevicewidget.h b/kmix/mixdevicewidget.h
index 9021e9d8..ccd779f6 100644
--- a/kmix/mixdevicewidget.h
+++ b/kmix/mixdevicewidget.h
@@ -52,7 +52,7 @@ class ViewBase;
 class MixDeviceWidget
  : public TQWidget
 {
-      Q_OBJECT
+      TQ_OBJECT
   
 
 public:
diff --git a/kmix/mixer.h b/kmix/mixer.h
index dfee29a3..2ec99a1e 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -42,7 +42,7 @@ class TDEConfig;
 
 class Mixer : public TQObject, virtual public MixerIface
 {
-      Q_OBJECT
+      TQ_OBJECT
   
 
    public:
diff --git a/kmix/viewapplet.h b/kmix/viewapplet.h
index fc788582..abd31746 100644
--- a/kmix/viewapplet.h
+++ b/kmix/viewapplet.h
@@ -12,7 +12,7 @@ class Mixer;
 
 class ViewApplet : public ViewBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ViewApplet(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KPanelApplet::Position pos);
diff --git a/kmix/viewbase.h b/kmix/viewbase.h
index 79f4220b..bda3aa06 100644
--- a/kmix/viewbase.h
+++ b/kmix/viewbase.h
@@ -16,7 +16,7 @@ class MixDevice;
   */
 class ViewBase : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
 
diff --git a/kmix/viewdockareapopup.h b/kmix/viewdockareapopup.h
index 8d4b0f90..a3f00342 100644
--- a/kmix/viewdockareapopup.h
+++ b/kmix/viewdockareapopup.h
@@ -17,7 +17,7 @@ class TQTime;
 
 class ViewDockAreaPopup : public ViewBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ViewDockAreaPopup(TQWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, KMixDockWidget *dockW);
diff --git a/kmix/viewinput.h b/kmix/viewinput.h
index 01d3e0fe..2164d2f1 100644
--- a/kmix/viewinput.h
+++ b/kmix/viewinput.h
@@ -7,7 +7,7 @@ class Mixer;
 
 class ViewInput : public ViewSliders
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ViewInput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
diff --git a/kmix/viewoutput.h b/kmix/viewoutput.h
index a0980494..93f710f8 100644
--- a/kmix/viewoutput.h
+++ b/kmix/viewoutput.h
@@ -7,7 +7,7 @@ class Mixer;
 
 class ViewOutput : public ViewSliders
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ViewOutput(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
diff --git a/kmix/viewsliders.h b/kmix/viewsliders.h
index ce282247..6bded967 100644
--- a/kmix/viewsliders.h
+++ b/kmix/viewsliders.h
@@ -9,7 +9,7 @@ class Mixer;
 
 class ViewSliders : public ViewBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ViewSliders(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
diff --git a/kmix/viewsurround.h b/kmix/viewsurround.h
index 1feebd89..df79ac8a 100644
--- a/kmix/viewsurround.h
+++ b/kmix/viewsurround.h
@@ -12,7 +12,7 @@ class Mixer;
 
 class ViewSurround : public ViewBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ViewSurround(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
diff --git a/kmix/viewswitches.h b/kmix/viewswitches.h
index 8370014e..6b5ec27a 100644
--- a/kmix/viewswitches.h
+++ b/kmix/viewswitches.h
@@ -9,7 +9,7 @@ class Mixer;
 
 class ViewSwitches : public ViewBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     ViewSwitches(TQWidget* parent, const char* name, const TQString & caption, Mixer* mixer, ViewBase::ViewFlags vflags);
diff --git a/krec/krecconfig_files.h b/krec/krecconfig_files.h
index 05869836..dcaa7b3d 100644
--- a/krec/krecconfig_files.h
+++ b/krec/krecconfig_files.h
@@ -28,7 +28,7 @@ class TQLabel;
 class KRecConfigFilesWidget;
 
 class KRecConfigFiles : public TDECModule {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecConfigFiles( TQWidget*, const char* =0, const TQStringList& = TQStringList() );
diff --git a/krec/krecconfig_fileswidget.h b/krec/krecconfig_fileswidget.h
index f7efa878..d40cd1d3 100644
--- a/krec/krecconfig_fileswidget.h
+++ b/krec/krecconfig_fileswidget.h
@@ -28,7 +28,7 @@ class TQLineEdit;
 class TQLabel;
 
 class KRecConfigFilesWidget : public TQVBox {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecConfigFilesWidget( TQWidget*, const char* =0 );
diff --git a/krec/krecconfigure.h b/krec/krecconfigure.h
index ee80efd0..51774fc5 100644
--- a/krec/krecconfigure.h
+++ b/krec/krecconfigure.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 class KPushButton;
 
 class KRecConfigGeneral : public TDECModule {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecConfigGeneral( TQWidget*, const char* =0, const TQStringList& = TQStringList() );
diff --git a/krec/krecexport_template.h b/krec/krecexport_template.h
index ea40357e..5eb64031 100644
--- a/krec/krecexport_template.h
+++ b/krec/krecexport_template.h
@@ -30,7 +30,7 @@
  * @author Arnold Krille <arnold@arnoldarts.de>
 */
 class KRecExportItem : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	/// Controls wether an export is running, or not...
diff --git a/krec/krecexport_wave.h b/krec/krecexport_wave.h
index cb6a8319..9322211c 100644
--- a/krec/krecexport_wave.h
+++ b/krec/krecexport_wave.h
@@ -20,7 +20,7 @@ class KTempFile;
 class TQFile;
 
 class KRecExport_Wave : public KRecExportItem {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecExport_Wave( TQObject*, const char* =0, const TQStringList& =0 );
diff --git a/krec/krecfile.h b/krec/krecfile.h
index ada2fa0d..86c29c77 100644
--- a/krec/krecfile.h
+++ b/krec/krecfile.h
@@ -27,7 +27,7 @@ class TQFile;
 class KRecFileViewWidget;
 
 class KRecFile : virtual public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 	friend class KRecFileWidget;
 public:
@@ -125,7 +125,7 @@ class TDEConfig;
 class TQDataStream;
 
 class KRecBuffer : virtual public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecBuffer( const TQString &, int, bool, KRecFile*, const char* =0 );
diff --git a/krec/krecfileview.h b/krec/krecfileview.h
index d8e571a1..b4583467 100644
--- a/krec/krecfileview.h
+++ b/krec/krecfileview.h
@@ -28,7 +28,7 @@ class KRecTimeBar;
 class KRecTimeDisplay;
 
 class KRecFileView : virtual public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecFileView( TQWidget*, const char* =0 );
diff --git a/krec/krecfileviewhelpers.h b/krec/krecfileviewhelpers.h
index 28fd6b12..8faf225e 100644
--- a/krec/krecfileviewhelpers.h
+++ b/krec/krecfileviewhelpers.h
@@ -26,7 +26,7 @@ class TQPopupMenu;
 class TDEPopupMenu;
 
 class KRecTimeBar : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecTimeBar( TQWidget*, const char* =0 );
@@ -56,7 +56,7 @@ private:
 */
 
 class KRecTimeDisplay : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecTimeDisplay( TQWidget*, const char* =0 );
@@ -93,7 +93,7 @@ private:
 
 
 class AKLabel : public TQLabel {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 	AKLabel( TQWidget* p, const char* n=0, WFlags f=0 ) : TQLabel( p, n, f ) { init(); }
diff --git a/krec/krecfilewidgets.h b/krec/krecfilewidgets.h
index 83489714..1c3f8329 100644
--- a/krec/krecfilewidgets.h
+++ b/krec/krecfilewidgets.h
@@ -36,7 +36,7 @@ class TDEAction;
 class TDEToggleAction;
 
 class KRecFileWidget : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecFileWidget( KRecFile*, TQWidget*, const char* =0 );
@@ -57,7 +57,7 @@ private:
 };
 
 class Sample : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	Sample() : _values( 0 ), _min( 0 ), _max( 0 ) {}
@@ -76,7 +76,7 @@ private:
 };
 
 class KRecBufferWidget : public TQFrame {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecBufferWidget( KRecBuffer*, TQWidget*, const char* =0 );
diff --git a/krec/krecglobal.h b/krec/krecglobal.h
index 4a7e6a70..4cb57681 100644
--- a/krec/krecglobal.h
+++ b/krec/krecglobal.h
@@ -26,7 +26,7 @@ class KStatusBar;
 class KRecExportItem;
 
 class KRecGlobal : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
   
 private:
 	KRecGlobal( TQObject* =0, const char* =0 );
diff --git a/krec/krecnewproperties.h b/krec/krecnewproperties.h
index 59bf7f55..978af5dd 100644
--- a/krec/krecnewproperties.h
+++ b/krec/krecnewproperties.h
@@ -27,7 +27,7 @@ class TQVBox;
 class KRecConfigFilesWidget;
 
 class KRecNewProperties : public TQDialog {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecNewProperties( TQWidget*, const char* =0 );
diff --git a/krec/krecord.h b/krec/krecord.h
index 450a9116..73628926 100644
--- a/krec/krecord.h
+++ b/krec/krecord.h
@@ -30,7 +30,7 @@ class KRecPrivate;
 	*/
 
 class KRecord : public TDEMainWindow  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	/// Constructor
diff --git a/krec/krecord_private.h b/krec/krecord_private.h
index 4c04833d..3be786c3 100644
--- a/krec/krecord_private.h
+++ b/krec/krecord_private.h
@@ -44,7 +44,7 @@ class TDERecentFilesAction;
 namespace KSettings { class Dialog; }
 
 class KRecPrivate : public TQObject  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	/// Constructor
@@ -129,7 +129,7 @@ public:
 };
 
 class KRecMainWidget : public TQWidget {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecMainWidget( TQWidget* p, const char* n=0 ) : TQWidget( p,n ) {
diff --git a/krec/mp3_export/krecexport_mp3.h b/krec/mp3_export/krecexport_mp3.h
index 22ccf8f4..3ba4eb14 100644
--- a/krec/mp3_export/krecexport_mp3.h
+++ b/krec/mp3_export/krecexport_mp3.h
@@ -22,7 +22,7 @@ class KTempFile;
 class TQFile;
 
 class KRecExport_MP3 : public KRecExportItem {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecExport_MP3( TQObject*, const char* =0, const TQStringList& =0 );
diff --git a/krec/ogg_export/krecexport_ogg.h b/krec/ogg_export/krecexport_ogg.h
index 53acda99..08437d19 100644
--- a/krec/ogg_export/krecexport_ogg.h
+++ b/krec/ogg_export/krecexport_ogg.h
@@ -26,7 +26,7 @@ class KTempFile;
 class TQFile;
 
 class KRecExport_OGG : public KRecExportItem {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
 	KRecExport_OGG( TQObject*, const char* =0, const TQStringList& =0 );
diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h
index 3b37ac38..194c5823 100644
--- a/kscd/bwlednum.h
+++ b/kscd/bwlednum.h
@@ -19,7 +19,7 @@
 
 class BW_LED_Number : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kscd/cddbdlg.h b/kscd/cddbdlg.h
index b111fc27..8df7da01 100644
--- a/kscd/cddbdlg.h
+++ b/kscd/cddbdlg.h
@@ -11,7 +11,7 @@ class CDInfoDialogBase;
 
 class CDDBDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/kscd/configWidget.h b/kscd/configWidget.h
index 315508b0..8bec1002 100644
--- a/kscd/configWidget.h
+++ b/kscd/configWidget.h
@@ -30,7 +30,7 @@ class SpecialComboBox;
 
 class configWidget : public configWidgetUI
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
    public:
diff --git a/kscd/docking.h b/kscd/docking.h
index b4f84b1c..481bbca7 100644
--- a/kscd/docking.h
+++ b/kscd/docking.h
@@ -45,7 +45,7 @@ class KPassivePopup;
 
 class DockWidget : public KSystemTray
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h
index 2e6830ca..e58aa7c7 100644
--- a/kscd/kcompactdisc.h
+++ b/kscd/kcompactdisc.h
@@ -46,7 +46,7 @@
 class TDECompactDisc :
     public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     enum InformationMode
diff --git a/kscd/kscd.h b/kscd/kscd.h
index 3fa7be5a..376a436b 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -71,7 +71,7 @@ typedef TQValueList<int> RandomList;
 
 class KSCD : public kscdPanelDlg, public KSessionManaged, virtual public DCOPObject {
 
-    Q_OBJECT
+    TQ_OBJECT
 //    
     K_DCOP
 
diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h
index 03dece91..e9eb98cb 100644
--- a/kscd/ledlamp.h
+++ b/kscd/ledlamp.h
@@ -28,7 +28,7 @@
 
 class LedLamp : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
diff --git a/libkcddb/asynccddbplookup.h b/libkcddb/asynccddbplookup.h
index d63f8d54..f4f5d8cb 100644
--- a/libkcddb/asynccddbplookup.h
+++ b/libkcddb/asynccddbplookup.h
@@ -29,7 +29,7 @@ namespace KCDDB
 {
   class AsyncCDDBPLookup : public CDDBPLookup 
   {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/libkcddb/asynchttplookup.h b/libkcddb/asynchttplookup.h
index 9e3f212b..ad27e6fc 100644
--- a/libkcddb/asynchttplookup.h
+++ b/libkcddb/asynchttplookup.h
@@ -28,7 +28,7 @@ namespace KCDDB
   class AsyncHTTPLookup : public HTTPLookup
   {
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/libkcddb/asynchttpsubmit.h b/libkcddb/asynchttpsubmit.h
index 0eb82ae7..6c21954c 100644
--- a/libkcddb/asynchttpsubmit.h
+++ b/libkcddb/asynchttpsubmit.h
@@ -25,7 +25,7 @@ namespace KCDDB
 {
   class AsyncHTTPSubmit : public HTTPSubmit
   {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
       AsyncHTTPSubmit(const TQString& from, const TQString& hostname, uint port);
diff --git a/libkcddb/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h
index fb96b401..710b6e06 100644
--- a/libkcddb/asyncsmtpsubmit.h
+++ b/libkcddb/asyncsmtpsubmit.h
@@ -26,7 +26,7 @@ namespace KCDDB
 {
   class AsyncSMTPSubmit : public SMTPSubmit
   {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/libkcddb/cdinfoencodingwidget.h b/libkcddb/cdinfoencodingwidget.h
index 36508475..32965907 100644
--- a/libkcddb/cdinfoencodingwidget.h
+++ b/libkcddb/cdinfoencodingwidget.h
@@ -26,7 +26,7 @@ namespace KCDDB
 {
     class CDInfoEncodingWidget : public CDInfoEncodingWidgetBase
     {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         CDInfoEncodingWidget(TQWidget* parent, const TQString& artist, const TQString& title,
diff --git a/libkcddb/client.h b/libkcddb/client.h
index 5d513878..c28d763e 100644
--- a/libkcddb/client.h
+++ b/libkcddb/client.h
@@ -42,7 +42,7 @@ namespace KCDDB
    */
   class KDE_EXPORT Client : public TQObject
   {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/libkcddb/httplookup.h b/libkcddb/httplookup.h
index e5ee54fe..57f0f06c 100644
--- a/libkcddb/httplookup.h
+++ b/libkcddb/httplookup.h
@@ -37,7 +37,7 @@ namespace KCDDB
   class HTTPLookup : public Lookup
   {
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/libkcddb/kcmcddb/cddbconfigwidget.h b/libkcddb/kcmcddb/cddbconfigwidget.h
index 459bdf6d..515ae811 100644
--- a/libkcddb/kcmcddb/cddbconfigwidget.h
+++ b/libkcddb/kcmcddb/cddbconfigwidget.h
@@ -26,7 +26,7 @@
 
 class CDDBConfigWidget : public CDDBConfigWidgetBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/kcmcddb/kcmcddb.h b/libkcddb/kcmcddb/kcmcddb.h
index 3600cc15..2ef3f245 100644
--- a/libkcddb/kcmcddb/kcmcddb.h
+++ b/libkcddb/kcmcddb/kcmcddb.h
@@ -29,7 +29,7 @@ class TDEConfigDialogManager;
 
 class CDDBModule : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/asynccddblookuptest.h b/libkcddb/test/asynccddblookuptest.h
index 459799e5..db139bc7 100644
--- a/libkcddb/test/asynccddblookuptest.h
+++ b/libkcddb/test/asynccddblookuptest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncCDDBLookupTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/asynchttplookuptest.h b/libkcddb/test/asynchttplookuptest.h
index b11c3893..4756b909 100644
--- a/libkcddb/test/asynchttplookuptest.h
+++ b/libkcddb/test/asynchttplookuptest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncHTTPLookupTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/asynchttpsubmittest.h b/libkcddb/test/asynchttpsubmittest.h
index bbcf8059..270483e0 100644
--- a/libkcddb/test/asynchttpsubmittest.h
+++ b/libkcddb/test/asynchttpsubmittest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncHTTPSubmitTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/libkcddb/test/asyncsmtpsubmittest.h b/libkcddb/test/asyncsmtpsubmittest.h
index d3b68bfc..77eba500 100644
--- a/libkcddb/test/asyncsmtpsubmittest.h
+++ b/libkcddb/test/asyncsmtpsubmittest.h
@@ -8,7 +8,7 @@ using namespace KCDDB;
 
 class AsyncSMTPSubmitTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h
index 54fbc19e..ac287a13 100644
--- a/noatun/library/cmodule.h
+++ b/noatun/library/cmodule.h
@@ -21,7 +21,7 @@ class KURLRequester;
 
 class General : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	General(TQObject *parent=0);
diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h
index 3434ae92..bdde7eac 100644
--- a/noatun/library/effectview.h
+++ b/noatun/library/effectview.h
@@ -35,7 +35,7 @@ class TQToolButton;
 
 class EffectView : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	EffectView();
@@ -74,7 +74,7 @@ private:
 
 class EffectList : public TDEListView
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	EffectList(TQWidget *parent);
diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h
index 0cec05a9..d8293a3a 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -16,7 +16,7 @@ class EqualizerWidget;
 
 class EqualizerLevel : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	EqualizerLevel(TQWidget *parent, VBand band);
@@ -36,7 +36,7 @@ private:
 
 class PresetList : public TDEListView
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	PresetList(TQWidget *parent, const char *name=0);
@@ -48,7 +48,7 @@ public:
 
 class EqualizerView : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
   
 	TQPtrList<EqualizerLevel> mBands;
 
diff --git a/noatun/library/globalvideo.h b/noatun/library/globalvideo.h
index 9414ca33..89522489 100644
--- a/noatun/library/globalvideo.h
+++ b/noatun/library/globalvideo.h
@@ -6,7 +6,7 @@
 
 class GlobalVideo : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 	TQPopupMenu *menu;
 	VideoFrame *video;
diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h
index c6619293..ea85810f 100644
--- a/noatun/library/mimetypetree.h
+++ b/noatun/library/mimetypetree.h
@@ -18,7 +18,7 @@
 
 class MimeTypeTree : public TDEListView
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	MimeTypeTree(TQWidget *parent);
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h
index 49ea0064..f8927376 100644
--- a/noatun/library/noatun/app.h
+++ b/noatun/library/noatun/app.h
@@ -30,7 +30,7 @@ namespace NoatunStdAction
  */
 class KDE_EXPORT NoatunApp : public KUniqueApplication
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class Playlist;
 
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index 37617183..693b3fdc 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -22,7 +22,7 @@ class TQLabel;
  **/
 class KDE_EXPORT L33tSlider : public TQSlider
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	L33tSlider(TQWidget * parent, const char * name=0);
@@ -56,7 +56,7 @@ private:
  **/
 class SliderAction : public TDEAction
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	SliderAction(const TQString& text, int accel, const TQObject *receiver,
diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h
index 093b57d0..ea0d48f3 100644
--- a/noatun/library/noatun/downloader.h
+++ b/noatun/library/noatun/downloader.h
@@ -65,7 +65,7 @@ private:
  **/
 class Downloader : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 	struct QueueItem
 	{
diff --git a/noatun/library/noatun/effects.h b/noatun/library/noatun/effects.h
index 73e5444f..0e299dde 100644
--- a/noatun/library/noatun/effects.h
+++ b/noatun/library/noatun/effects.h
@@ -96,7 +96,7 @@ private:
  **/
 class Effects : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class Effect;
 public:
diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h
index 7be41d45..e4dc1403 100644
--- a/noatun/library/noatun/engine.h
+++ b/noatun/library/noatun/engine.h
@@ -32,7 +32,7 @@ class NoatunApp;
  **/
 class KDE_EXPORT Engine : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class NoatunApp;
 public:
diff --git a/noatun/library/noatun/equalizer.h b/noatun/library/noatun/equalizer.h
index a654fd13..e0eea2af 100644
--- a/noatun/library/noatun/equalizer.h
+++ b/noatun/library/noatun/equalizer.h
@@ -105,7 +105,7 @@ friend class Band;
 friend class Preset;
 friend class Engine;
 
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	Equalizer();
diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h
index c4821d0f..3f3b3ae8 100644
--- a/noatun/library/noatun/player.h
+++ b/noatun/library/noatun/player.h
@@ -21,7 +21,7 @@ class KLibrary;
  **/
 class KDE_EXPORT Player : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class Effects;
 friend class PlaylistItemData;
diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h
index b80721a0..a8188e3b 100644
--- a/noatun/library/noatun/playlist.h
+++ b/noatun/library/noatun/playlist.h
@@ -328,7 +328,7 @@ private:
  **/
 class Playlist : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 	friend class PlaylistItemData;
 public:
diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h
index 23b6e481..f01b0f27 100644
--- a/noatun/library/noatun/plugin.h
+++ b/noatun/library/noatun/plugin.h
@@ -404,7 +404,7 @@ class NoatunListenerNotif;
  **/
 class NoatunListener : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class NoatunListenerNotif;
 
@@ -453,7 +453,7 @@ private:
  **/
 class BoolNotifier : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	BoolNotifier(bool *value, NoatunListener *listener, TQObject *parent=0);
diff --git a/noatun/library/noatun/pref.h b/noatun/library/noatun/pref.h
index 07275b56..4745a010 100644
--- a/noatun/library/noatun/pref.h
+++ b/noatun/library/noatun/pref.h
@@ -12,7 +12,7 @@ class CModule;
  **/
 class NoatunPreferences : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class CModule;
 
@@ -56,7 +56,7 @@ private:
  **/
 class KDE_EXPORT CModule : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h
index aa2b3450..3260c70c 100644
--- a/noatun/library/noatun/scrollinglabel.h
+++ b/noatun/library/noatun/scrollinglabel.h
@@ -30,7 +30,7 @@
  **/
 class ScrollingLabel : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 	public:
diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h
index 31f5d20c..0ddf7f20 100644
--- a/noatun/library/noatun/stdaction.h
+++ b/noatun/library/noatun/stdaction.h
@@ -19,7 +19,7 @@ namespace NoatunStdAction
  **/
 class PlayAction : public TDEAction
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	PlayAction(TQObject *parent, const char *name);
@@ -33,7 +33,7 @@ private slots:
  **/
 class PlaylistAction : public TDEToggleAction
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	PlaylistAction(TQObject *parent, const char *name);
@@ -48,7 +48,7 @@ private slots:
  */
 class PluginActionMenu : public TDEActionMenu
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	PluginActionMenu(TQObject *parent, const char *name);
@@ -82,7 +82,7 @@ private:
  */
 class VisActionMenu : public TDEActionMenu
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	VisActionMenu(TQObject *parent, const char *name);
@@ -100,7 +100,7 @@ private:
  */
 class LoopActionMenu : public TDEActionMenu
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	LoopActionMenu(TQObject *parent, const char *name);
diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h
index 5ff9e904..477443d4 100644
--- a/noatun/library/noatun/stereobuttonaction.h
+++ b/noatun/library/noatun/stereobuttonaction.h
@@ -12,7 +12,7 @@ namespace NoatunStdAction
  */
 class StereoButtonAction : public TDEAction
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h
index 4a5621ef..244fcd11 100644
--- a/noatun/library/noatun/vequalizer.h
+++ b/noatun/library/noatun/vequalizer.h
@@ -136,7 +136,7 @@ public:
  **/
 class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	struct Private;
 	Private *d;
@@ -176,7 +176,7 @@ class VPreset;
  **/
 class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	friend class VBand;
 	friend class VPreset;
diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h
index ece120fe..9719f245 100644
--- a/noatun/library/noatun/video.h
+++ b/noatun/library/noatun/video.h
@@ -11,7 +11,7 @@ class TQPopupMenu;
  **/
 class VideoFrame : public KVideoWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 	struct Private;
 	VideoFrame::Private *d;
diff --git a/noatun/library/noatuntags/tagsgetter.h b/noatun/library/noatuntags/tagsgetter.h
index c48727ea..65e3bdcd 100644
--- a/noatun/library/noatuntags/tagsgetter.h
+++ b/noatun/library/noatuntags/tagsgetter.h
@@ -9,7 +9,7 @@
 
 class TagsGetter : public TQObject, public PlaylistNotifier
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	TagsGetter();
@@ -47,7 +47,7 @@ private:
 
 class Control : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	Control(TagsGetter* parent);
diff --git a/noatun/library/plugin_deps.h b/noatun/library/plugin_deps.h
index 777c70e3..875bec35 100644
--- a/noatun/library/plugin_deps.h
+++ b/noatun/library/plugin_deps.h
@@ -11,7 +11,7 @@ class NoatunListener;
 
 class TimerThingy : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	TimerThingy(Visualization*);
diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h
index 47519d66..804ea492 100644
--- a/noatun/library/pluginmodule.h
+++ b/noatun/library/pluginmodule.h
@@ -50,7 +50,7 @@ private:
 
 class PluginListView : public TDEListView
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 friend class PluginListItem;
@@ -75,7 +75,7 @@ private:
 
 class Plugins : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	Plugins(TQObject *_parent = 0);
diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h
index 2bb13243..5c0d9349 100644
--- a/noatun/library/titleproxy.h
+++ b/noatun/library/titleproxy.h
@@ -48,7 +48,7 @@ namespace TitleProxy
 
     class Proxy : public TQObject
     {
-            Q_OBJECT
+            TQ_OBJECT
   
         public:
             Proxy( KURL url );
@@ -111,7 +111,7 @@ namespace TitleProxy
 
     class Server : public TQServerSocket
     {
-            Q_OBJECT
+            TQ_OBJECT
   
 
         public:
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index a5aca1a1..79a1a2da 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -49,7 +49,7 @@ class TDEToggleAction;
  */
 class Excellent : public TDEMainWindow, public UserInterface
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index c5928ed7..f2262faf 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -33,7 +33,7 @@ class TDEAction;
 
 class HTMLExport : public TQObject, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 NOATUNPLUGIND
 public:
@@ -54,7 +54,7 @@ private slots:
 
 class Prefs : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	Prefs(TQObject *parent);
diff --git a/noatun/modules/infrared/infrared.h b/noatun/modules/infrared/infrared.h
index a8c9bd56..df3883d8 100644
--- a/noatun/modules/infrared/infrared.h
+++ b/noatun/modules/infrared/infrared.h
@@ -10,7 +10,7 @@ class Lirc;
 
 class InfraRed : public TQObject, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 NOATUNPLUGIND
 public:
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 6646456e..925cf638 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -14,7 +14,7 @@ class Lirc;
 
 class IRPrefs : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	enum Action
diff --git a/noatun/modules/infrared/lirc.h b/noatun/modules/infrared/lirc.h
index c770cbac..4b455da5 100644
--- a/noatun/modules/infrared/lirc.h
+++ b/noatun/modules/infrared/lirc.h
@@ -12,7 +12,7 @@ typedef TQMap<TQString, TQStringList> Remotes;
 
 class Lirc : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	/**
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index 50ab3808..6917f879 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -26,7 +26,7 @@ class TQLabel;
 
 class KaimanPrefDlg : public CModule
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
 	KaimanPrefDlg( TQObject *parent );
diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 160dee8b..f3489448 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -30,7 +30,7 @@
 
 class KaimanStyleElement : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     KaimanStyleElement(TQWidget *parent, const char *name=0);
@@ -71,7 +71,7 @@ private:
 
 class KaimanStyleMasked : public KaimanStyleElement
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleMasked(TQWidget *parent, const char *name=0)
@@ -88,7 +88,7 @@ public:
 
 class KaimanStyleButton : public KaimanStyleMasked
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleButton(TQWidget *parent, const char *name=0);
@@ -126,7 +126,7 @@ private:
 
 class KaimanStyleSlider : public KaimanStyleMasked
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0);
@@ -165,7 +165,7 @@ protected:
 
 class KaimanStyleBackground : public KaimanStyleMasked
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleBackground(TQWidget *parent, const char *name=0);
@@ -185,7 +185,7 @@ private:
 
 class KaimanStyleValue : public KaimanStyleMasked
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0);
@@ -204,7 +204,7 @@ private:
 
 class KaimanStyleState : public KaimanStyleMasked
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleState(TQWidget *parent, const char *name=0);
@@ -228,7 +228,7 @@ private:
 
 class KaimanStyleNumber : public KaimanStyleElement
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleNumber(TQWidget *parent, const char *name=0);
@@ -253,7 +253,7 @@ private:
 
 class KaimanStyleText : public KaimanStyleElement
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleText(TQWidget *parent, const char *name=0);
@@ -288,7 +288,7 @@ private:
 
 class KaimanStyleAnimation : public KaimanStyleMasked
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0);
@@ -309,7 +309,7 @@ private:
 
 class KaimanStyle : public TQWidget
 {
- Q_OBJECT
+ TQ_OBJECT
   
 public:
     KaimanStyle(TQWidget *parent, const char *name=0);
diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h
index f4f712a4..0d10a34d 100644
--- a/noatun/modules/kaiman/userinterface.h
+++ b/noatun/modules/kaiman/userinterface.h
@@ -34,7 +34,7 @@ class Player;
  */
 class Kaiman : public TDEMainWindow, public UserInterface
 {
-Q_OBJECT
+TQ_OBJECT
   
  public:
     Kaiman();
diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h
index 2145448b..f137fcbd 100644
--- a/noatun/modules/keyz/keyz.h
+++ b/noatun/modules/keyz/keyz.h
@@ -6,7 +6,7 @@
 
 class Keyz : public TQObject, public Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     NOATUNPLUGIND
 
@@ -35,7 +35,7 @@ private:
 
 class KeyzPrefs : public CModule
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/noatun/modules/kjofol-skin/kjbutton.h b/noatun/modules/kjofol-skin/kjbutton.h
index 28dcf355..c6e6ae40 100644
--- a/noatun/modules/kjofol-skin/kjbutton.h
+++ b/noatun/modules/kjofol-skin/kjbutton.h
@@ -7,7 +7,7 @@ class KJLoader;
 
 class KJButton : public TQObject, public KJWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	KJButton(const TQStringList&, KJLoader *);
diff --git a/noatun/modules/kjofol-skin/kjequalizer.h b/noatun/modules/kjofol-skin/kjequalizer.h
index 7415ef2f..6331e285 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -10,7 +10,7 @@ class VInterpolation;
 
 class KJEqualizer : public TQObject, public KJWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	KJEqualizer(const TQStringList &, KJLoader *parent);
diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h
index 27af10a3..1c8bf6fc 100644
--- a/noatun/modules/kjofol-skin/kjloader.h
+++ b/noatun/modules/kjofol-skin/kjloader.h
@@ -32,7 +32,7 @@ class KJPrefs;
 
 class KJLoader :  public TQWidget, public UserInterface, public Parser
 {
-Q_OBJECT
+TQ_OBJECT
   
 NOATUNPLUGIND
 
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index 0226cfdd..bb36e631 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -24,7 +24,7 @@ class KJLoader;
 
 class KJPrefs : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	KJPrefs(TQObject* parent);
diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.h b/noatun/modules/kjofol-skin/kjtextdisplay.h
index 3487ae0d..ffb3cbae 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.h
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.h
@@ -11,7 +11,7 @@ class KPixmap;
 
 class KJFilename : public TQObject, public KJWidget
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	KJFilename(const TQStringList &, KJLoader *parent);
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index 00789b43..651417ba 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -34,7 +34,7 @@ class Player;
 
 class Marquis : public TDEMainWindow, public SessionManagement
 {
-Q_OBJECT
+TQ_OBJECT
   
 NOATUNPLUGIND
 public:
diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h
index 801c2e53..c86f18da 100644
--- a/noatun/modules/metatag/edit.h
+++ b/noatun/modules/metatag/edit.h
@@ -16,7 +16,7 @@ struct MetaWidget {
 };
 
 class Editor:public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     Editor();
diff --git a/noatun/modules/metatag/metatag.h b/noatun/modules/metatag/metatag.h
index 43eb9f3c..ec70edf6 100644
--- a/noatun/modules/metatag/metatag.h
+++ b/noatun/modules/metatag/metatag.h
@@ -12,7 +12,7 @@ class KFileMetaInfo;
 class TDEAction;
 
 class MetaTagLoader:public TQObject, public Tags, public Plugin {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     MetaTagLoader();
diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h
index 7fddb26b..2b1a8c3a 100644
--- a/noatun/modules/monoscope/monoscope.h
+++ b/noatun/modules/monoscope/monoscope.h
@@ -7,7 +7,7 @@ class TDEToggleAction;
 
 class Monoscope : public TQWidget,  public MonoScope, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 NOATUNPLUGIND
 
diff --git a/noatun/modules/net/net.h b/noatun/modules/net/net.h
index 68df6e20..4548f63f 100644
--- a/noatun/modules/net/net.h
+++ b/noatun/modules/net/net.h
@@ -9,7 +9,7 @@
 
 class Net : public TQServerSocket, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/noatun/modules/noatunui/userinterface.h b/noatun/modules/noatunui/userinterface.h
index 1b384be9..797fc4ac 100644
--- a/noatun/modules/noatunui/userinterface.h
+++ b/noatun/modules/noatunui/userinterface.h
@@ -23,7 +23,7 @@ class KStatusBar;
  */
 class MilkChocolate : public TQWidget, public UserInterface
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	MilkChocolate();
diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h
index a218f574..17f5b3ea 100644
--- a/noatun/modules/simple/userinterface.h
+++ b/noatun/modules/simple/userinterface.h
@@ -27,7 +27,7 @@
 
 class SimpleUI : public TDEMainWindow, public UserInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h
index d44bb0e5..c77a6424 100644
--- a/noatun/modules/splitplaylist/find.h
+++ b/noatun/modules/splitplaylist/find.h
@@ -9,7 +9,7 @@ class TQPushButton;
 
 class Finder : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	Finder(TQWidget *parent);
diff --git a/noatun/modules/splitplaylist/playlist.h b/noatun/modules/splitplaylist/playlist.h
index de025ad5..9ac27bc2 100644
--- a/noatun/modules/splitplaylist/playlist.h
+++ b/noatun/modules/splitplaylist/playlist.h
@@ -27,7 +27,7 @@ class TQListViewItem;
 
 class SplitPlaylist : public Playlist, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class SafeListViewItem;
 friend class List;
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 4eef4e9b..54578cb4 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -57,7 +57,7 @@ private:
 
 class List : public TDEListView
 {
-Q_OBJECT
+TQ_OBJECT
   
 friend class View;
 public:
@@ -105,7 +105,7 @@ class TDEToolBar;
 
 class View : public TDEMainWindow
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	View(SplitPlaylist *mother);
diff --git a/noatun/modules/systray/cmodule.h b/noatun/modules/systray/cmodule.h
index 10196423..dd8784d3 100644
--- a/noatun/modules/systray/cmodule.h
+++ b/noatun/modules/systray/cmodule.h
@@ -33,7 +33,7 @@ class YHConfigWidget;
 
 class YHModule : public CModule
 {
-Q_OBJECT
+TQ_OBJECT
   
 	public:
 		YHModule(TQObject *_parent);
diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h
index 13a8b518..709a8f07 100644
--- a/noatun/modules/systray/kitsystemtray.h
+++ b/noatun/modules/systray/kitsystemtray.h
@@ -36,7 +36,7 @@ class TQPixmap;
 
 class KitSystemTray : public KSystemTray
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index 80592b07..3adc59cf 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -40,7 +40,7 @@ class PassivePopup;
 
 class NoatunSystray : public TDEMainWindow, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	NoatunSystray();
diff --git a/noatun/modules/voiceprint/prefs.h b/noatun/modules/voiceprint/prefs.h
index 16b8032f..c317cc45 100644
--- a/noatun/modules/voiceprint/prefs.h
+++ b/noatun/modules/voiceprint/prefs.h
@@ -8,7 +8,7 @@ class KColorButton;
 
 class Prefs : public CModule
 { 
-Q_OBJECT
+TQ_OBJECT
   
 public:
 	Prefs(TQObject* parent);
diff --git a/noatun/modules/voiceprint/voiceprint.h b/noatun/modules/voiceprint/voiceprint.h
index 0440e8c4..b3ce0d29 100644
--- a/noatun/modules/voiceprint/voiceprint.h
+++ b/noatun/modules/voiceprint/voiceprint.h
@@ -5,7 +5,7 @@
 
 class VoicePrint : public TQWidget,  public MonoFFTScope, public Plugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.h b/noatun/modules/winskin/guiSpectrumAnalyser.h
index 05657424..a29fd18b 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.h
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.h
@@ -28,7 +28,7 @@ enum visualizationMode {MODE_DISABLED = 0, MODE_ANALYSER = 1};
 enum analyserMode {MODE_NORMAL = 0, MODE_FIRE = 1, MODE_VERTICAL_LINES = 2};
 
 class GuiSpectrumAnalyser : public WaWidget  {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waBalanceSlider.h b/noatun/modules/winskin/waBalanceSlider.h
index 7a08ca04..7eb77055 100644
--- a/noatun/modules/winskin/waBalanceSlider.h
+++ b/noatun/modules/winskin/waBalanceSlider.h
@@ -20,7 +20,7 @@
 #include "waWidget.h"
 
 class WaBalanceSlider : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
     
 
   public:
diff --git a/noatun/modules/winskin/waButton.h b/noatun/modules/winskin/waButton.h
index 69afecea..c8ecd05c 100644
--- a/noatun/modules/winskin/waButton.h
+++ b/noatun/modules/winskin/waButton.h
@@ -20,7 +20,7 @@
 #include "waWidget.h"
 
 class WaButton : public WaWidget {
-  Q_OBJECT
+  TQ_OBJECT
   
  public:
    WaButton(int mapId);
diff --git a/noatun/modules/winskin/waClutterbar.h b/noatun/modules/winskin/waClutterbar.h
index 070d9e7e..29892a98 100644
--- a/noatun/modules/winskin/waClutterbar.h
+++ b/noatun/modules/winskin/waClutterbar.h
@@ -5,7 +5,7 @@
 #include "waWidget.h"
 
 class WaClutterbar : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waDigit.h b/noatun/modules/winskin/waDigit.h
index 8d159e71..2e8210ec 100644
--- a/noatun/modules/winskin/waDigit.h
+++ b/noatun/modules/winskin/waDigit.h
@@ -21,7 +21,7 @@
 #include "waWidget.h"
 
 class WaDigit : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waIndicator.h b/noatun/modules/winskin/waIndicator.h
index 48dcdab1..663bf0d9 100644
--- a/noatun/modules/winskin/waIndicator.h
+++ b/noatun/modules/winskin/waIndicator.h
@@ -21,7 +21,7 @@
 #include "waWidget.h"
 
 class WaIndicator : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waInfo.h b/noatun/modules/winskin/waInfo.h
index df29322a..a800cf54 100644
--- a/noatun/modules/winskin/waInfo.h
+++ b/noatun/modules/winskin/waInfo.h
@@ -22,7 +22,7 @@
 #include "waWidget.h"
 
 class WaInfo : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waJumpSlider.h b/noatun/modules/winskin/waJumpSlider.h
index dc92c388..50014aad 100644
--- a/noatun/modules/winskin/waJumpSlider.h
+++ b/noatun/modules/winskin/waJumpSlider.h
@@ -19,7 +19,7 @@
 #include "waWidget.h"
 
 class WaJumpSlider : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waLabel.h b/noatun/modules/winskin/waLabel.h
index 4bbc057c..ddaf8659 100644
--- a/noatun/modules/winskin/waLabel.h
+++ b/noatun/modules/winskin/waLabel.h
@@ -17,7 +17,7 @@
 #include "waWidget.h"
 
 class WaLabel : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
     
 
   public:
diff --git a/noatun/modules/winskin/waMain.h b/noatun/modules/winskin/waMain.h
index ba8aec08..ff175fd8 100644
--- a/noatun/modules/winskin/waMain.h
+++ b/noatun/modules/winskin/waMain.h
@@ -4,7 +4,7 @@
 #include "waWidget.h"
 
 class WaMain : WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     WaMain();
diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h
index bba125cd..20b137a5 100644
--- a/noatun/modules/winskin/waSkin.h
+++ b/noatun/modules/winskin/waSkin.h
@@ -45,7 +45,7 @@ class WaSkin;
 extern WaSkin *_waskin_instance;
 
 class WaSkin : public TQWidget, public UserInterface {
-  Q_OBJECT
+  TQ_OBJECT
    
   NOATUNPLUGIND
     WaSkinModel *waSkinModel;
diff --git a/noatun/modules/winskin/waSkinManager.h b/noatun/modules/winskin/waSkinManager.h
index a3b06c45..dd9f7815 100644
--- a/noatun/modules/winskin/waSkinManager.h
+++ b/noatun/modules/winskin/waSkinManager.h
@@ -8,7 +8,7 @@
 #include <tqmap.h>
 
 class WaSkinManager : public TQObject, public DCOPObject {
-Q_OBJECT
+TQ_OBJECT
 //
 K_DCOP
 
diff --git a/noatun/modules/winskin/waSkinModel.h b/noatun/modules/winskin/waSkinModel.h
index 45898c45..88430293 100644
--- a/noatun/modules/winskin/waSkinModel.h
+++ b/noatun/modules/winskin/waSkinModel.h
@@ -26,7 +26,7 @@ class WaSkinModel;
 extern WaSkinModel *_waskinmodel_instance;
 
 class WaSkinModel : public TQObject {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waSlider.h b/noatun/modules/winskin/waSlider.h
index b5e50a0e..0758231e 100644
--- a/noatun/modules/winskin/waSlider.h
+++ b/noatun/modules/winskin/waSlider.h
@@ -22,7 +22,7 @@
 #include "waButton.h"
 
 class WaSlider : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h
index 8bf0067e..0e02103b 100644
--- a/noatun/modules/winskin/waStatus.h
+++ b/noatun/modules/winskin/waStatus.h
@@ -23,7 +23,7 @@
 enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED};
 
 class WaStatus : public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waTitleBar.h b/noatun/modules/winskin/waTitleBar.h
index 2d9e3fde..8e6096bc 100644
--- a/noatun/modules/winskin/waTitleBar.h
+++ b/noatun/modules/winskin/waTitleBar.h
@@ -28,7 +28,7 @@
 
 
 class WaTitleBar : public WaIndicator {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
diff --git a/noatun/modules/winskin/waVolumeSlider.h b/noatun/modules/winskin/waVolumeSlider.h
index 9d872c9f..a528abef 100644
--- a/noatun/modules/winskin/waVolumeSlider.h
+++ b/noatun/modules/winskin/waVolumeSlider.h
@@ -19,7 +19,7 @@
 #include "waWidget.h"
 
 class WaVolumeSlider:public WaWidget {
-    Q_OBJECT
+    TQ_OBJECT
     
 
   public:
diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h
index fa86f26b..81f12f14 100644
--- a/noatun/modules/winskin/waWidget.h
+++ b/noatun/modules/winskin/waWidget.h
@@ -5,7 +5,7 @@
 #include "waSkinModel.h"
 
 class WaWidget : public TQWidget {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     WaWidget(int mapping);
diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h
index b25b7178..99220e6e 100644
--- a/noatun/modules/winskin/winSkinConfig.h
+++ b/noatun/modules/winskin/winSkinConfig.h
@@ -9,7 +9,7 @@ class WaSkinManager;
 class TQSlider;
 
 class WinSkinConfig:public CModule {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     WinSkinConfig(TQWidget * parent, WaSkinManager *waManager);
diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h
index 88d756c4..502c507c 100644
--- a/noatun/modules/winskin/winSkinVis.h
+++ b/noatun/modules/winskin/winSkinVis.h
@@ -24,7 +24,7 @@
 #include "vis/winskinvis.h"
 
 class WinSkinVis : public TQObject, public Visualization {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/tdefile-plugins/au/tdefile_au.h b/tdefile-plugins/au/tdefile_au.h
index 9d5104ef..14b141fc 100644
--- a/tdefile-plugins/au/tdefile_au.h
+++ b/tdefile-plugins/au/tdefile_au.h
@@ -26,7 +26,7 @@ class TQStringList;
 
 class KAuPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/avi/tdefile_avi.h b/tdefile-plugins/avi/tdefile_avi.h
index a533723b..f6718bff 100644
--- a/tdefile-plugins/avi/tdefile_avi.h
+++ b/tdefile-plugins/avi/tdefile_avi.h
@@ -36,7 +36,7 @@ class TQStringList;
 
 class KAviPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/flac/tdefile_flac.h b/tdefile-plugins/flac/tdefile_flac.h
index 982a8a51..72c1f8c6 100644
--- a/tdefile-plugins/flac/tdefile_flac.h
+++ b/tdefile-plugins/flac/tdefile_flac.h
@@ -31,7 +31,7 @@ class TQStringList;
 
 class KFlacPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/tdefile-plugins/m3u/tdefile_m3u.h b/tdefile-plugins/m3u/tdefile_m3u.h
index 08a6c506..da2142a9 100644
--- a/tdefile-plugins/m3u/tdefile_m3u.h
+++ b/tdefile-plugins/m3u/tdefile_m3u.h
@@ -28,7 +28,7 @@ class TQStringList;
 
 class KM3uPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/mp3/tdefile_mp3.h b/tdefile-plugins/mp3/tdefile_mp3.h
index cc01aa3e..d6e13cb8 100644
--- a/tdefile-plugins/mp3/tdefile_mp3.h
+++ b/tdefile-plugins/mp3/tdefile_mp3.h
@@ -25,7 +25,7 @@ class TQStringList;
 
 class KMp3Plugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/tdefile-plugins/mpc/tdefile_mpc.h b/tdefile-plugins/mpc/tdefile_mpc.h
index 4bb3a387..b3a223e4 100644
--- a/tdefile-plugins/mpc/tdefile_mpc.h
+++ b/tdefile-plugins/mpc/tdefile_mpc.h
@@ -31,7 +31,7 @@ class TQStringList;
 
 class KMpcPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/tdefile-plugins/mpeg/tdefile_mpeg.h b/tdefile-plugins/mpeg/tdefile_mpeg.h
index 113bd8ee..0bfc2093 100644
--- a/tdefile-plugins/mpeg/tdefile_mpeg.h
+++ b/tdefile-plugins/mpeg/tdefile_mpeg.h
@@ -27,7 +27,7 @@ class TQStringList;
 
 class KMpegPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/tdefile-plugins/ogg/tdefile_ogg.h b/tdefile-plugins/ogg/tdefile_ogg.h
index f03e4283..38e65047 100644
--- a/tdefile-plugins/ogg/tdefile_ogg.h
+++ b/tdefile-plugins/ogg/tdefile_ogg.h
@@ -28,7 +28,7 @@ class TQStringList;
 
 class KOggPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/sid/tdefile_sid.h b/tdefile-plugins/sid/tdefile_sid.h
index fadf13f5..cec8465c 100644
--- a/tdefile-plugins/sid/tdefile_sid.h
+++ b/tdefile-plugins/sid/tdefile_sid.h
@@ -27,7 +27,7 @@ class TQStringList;
 
 class KSidPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/theora/tdefile_theora.h b/tdefile-plugins/theora/tdefile_theora.h
index a1aa0c09..69b3dcd8 100644
--- a/tdefile-plugins/theora/tdefile_theora.h
+++ b/tdefile-plugins/theora/tdefile_theora.h
@@ -30,7 +30,7 @@ class TQStringList;
 
 class theoraPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefile-plugins/wav/tdefile_wav.h b/tdefile-plugins/wav/tdefile_wav.h
index 53eb6ccd..07c581a9 100644
--- a/tdefile-plugins/wav/tdefile_wav.h
+++ b/tdefile-plugins/wav/tdefile_wav.h
@@ -26,7 +26,7 @@ class TQStringList;
 
 class KWavPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h
index f89ef32f..b7f186cb 100644
--- a/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h
+++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h
@@ -31,7 +31,7 @@ class TDEConfigDialogManager;
 #include "audiocdconfig.h"
 class KAudiocdModule : public AudiocdConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdeioslave/audiocd/plugins/lame/collectingprocess.h b/tdeioslave/audiocd/plugins/lame/collectingprocess.h
index 905219bf..963a59d3 100644
--- a/tdeioslave/audiocd/plugins/lame/collectingprocess.h
+++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.h
@@ -44,7 +44,7 @@
  * @author Ingo Kloecker <kloecker@kde.org>
  */
 class CollectingProcess : public TDEProcess {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   CollectingProcess( TQObject * parent = 0, const char * name = 0 );
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.h b/tdeioslave/audiocd/plugins/lame/encoderlame.h
index 09c323c3..2870c500 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.h
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.h
@@ -29,7 +29,7 @@ class TDEProcess;
  */
 class EncoderLame : public TQObject, public AudioCDEncoder {
 
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
diff --git a/tdemid/channel.h b/tdemid/channel.h
index 4f88ae36..2674ffe5 100644
--- a/tdemid/channel.h
+++ b/tdemid/channel.h
@@ -38,7 +38,7 @@ class TQComboBox;
 class KMidButton;
 class KMidChannel : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 private:
diff --git a/tdemid/channelcfgdlg.h b/tdemid/channelcfgdlg.h
index c4378e4e..73a21efc 100644
--- a/tdemid/channelcfgdlg.h
+++ b/tdemid/channelcfgdlg.h
@@ -30,7 +30,7 @@ class TQVButtonGroup;
 class TQRadioButton;
 class ChannelViewConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/tdemid/channelview.h b/tdemid/channelview.h
index b54015ce..c26ba564 100644
--- a/tdemid/channelview.h
+++ b/tdemid/channelview.h
@@ -32,7 +32,7 @@
 
 class ChannelView : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 private:
     KMidChannel *Channel[16];
diff --git a/tdemid/collectdlg.h b/tdemid/collectdlg.h
index 262a6227..fcf4b94a 100644
--- a/tdemid/collectdlg.h
+++ b/tdemid/collectdlg.h
@@ -35,7 +35,7 @@ class TQListBox;
 class KURL;
 class CollectionDialog : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 private:
 	SLManager *slman;
diff --git a/tdemid/kdisptext.h b/tdemid/kdisptext.h
index 04a25f27..548e849e 100644
--- a/tdemid/kdisptext.h
+++ b/tdemid/kdisptext.h
@@ -50,7 +50,7 @@ class TQScrollBar;
 
 class KDisplayText : public TQScrollView 
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 private:
     TQTextCodec *lyrics_codec;    
diff --git a/tdemid/klcdnumber.h b/tdemid/klcdnumber.h
index b124a5db..d824d2d1 100644
--- a/tdemid/klcdnumber.h
+++ b/tdemid/klcdnumber.h
@@ -32,7 +32,7 @@ class TQColor;
 
 class KLCDNumber : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 protected:
     class digit {
diff --git a/tdemid/ktrianglebutton.h b/tdemid/ktrianglebutton.h
index 5013b8d8..a6b840ee 100644
--- a/tdemid/ktrianglebutton.h
+++ b/tdemid/ktrianglebutton.h
@@ -32,7 +32,7 @@
 
 class KTriangleButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/tdemid/midicfgdlg.h b/tdemid/midicfgdlg.h
index 98585e6f..e15f73ca 100644
--- a/tdemid/midicfgdlg.h
+++ b/tdemid/midicfgdlg.h
@@ -33,7 +33,7 @@ class TQPushButton;
 class TQListBox;
 class MidiConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdemid/qslidertime.h b/tdemid/qslidertime.h
index 57aa3b18..4131cde5 100644
--- a/tdemid/qslidertime.h
+++ b/tdemid/qslidertime.h
@@ -30,7 +30,7 @@ class TQWidget;
 
 class QSliderTime : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 private:
 
diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h
index 3640ccfd..7217a7b7 100644
--- a/tdemid/tdemid_part.h
+++ b/tdemid/tdemid_part.h
@@ -11,7 +11,7 @@ class tdemidClient;
 
 class KDE_EXPORT KMidFactory : public KParts::Factory
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     KMidFactory();
@@ -31,7 +31,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
 
 class KMidPart: public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     KMidPart(TQWidget *parentWidget, const char *widgetName, 
@@ -55,7 +55,7 @@ class KMidPart: public KParts::ReadOnlyPart
 
 class KMidBrowserExtension : public KParts::BrowserExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
   
     friend class KMidPart;
   public:
diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h
index a5ebd4c9..15ffda08 100644
--- a/tdemid/tdemidclient.h
+++ b/tdemid/tdemidclient.h
@@ -54,7 +54,7 @@ class TQString;
 
 class tdemidClient : public TQWidget, virtual public KMidIface
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 private:
 #ifdef TDEMidDEBUG
diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h
index bba4e6f7..864be3de 100644
--- a/tdemid/tdemidframe.h
+++ b/tdemid/tdemidframe.h
@@ -41,7 +41,7 @@ class TDEAccel;
 
 class KDE_EXPORT tdemidFrame : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 private:
 #ifdef TDEMidDEBUG
diff --git a/xine_artsplugin/tools/thumbnail/videocreator.h b/xine_artsplugin/tools/thumbnail/videocreator.h
index 439b9cf4..dc8a519d 100644
--- a/xine_artsplugin/tools/thumbnail/videocreator.h
+++ b/xine_artsplugin/tools/thumbnail/videocreator.h
@@ -24,7 +24,7 @@
 
 class VideoCreator : public TQObject, public ThumbCreator
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     VideoCreator();