diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.h b/kaffeine/src/input/audiobrowser/googlefetcher.h
index caee57a..1fb7779 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcher.h
+++ b/kaffeine/src/input/audiobrowser/googlefetcher.h
@@ -53,7 +53,7 @@ typedef TQValueList<GoogleImage> GoogleImageList;
 
 class GoogleFetcher : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
index e7e4831..2199b42 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
@@ -30,7 +30,7 @@ class KURL;
 
 class GoogleFetcherDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -81,7 +81,7 @@ namespace TDEIO
 
 class CoverIconViewItem : public TQObject, public TDEIconViewItem
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
index 4d6df08..a892604 100644
--- a/kaffeine/src/input/audiobrowser/playlist.h
+++ b/kaffeine/src/input/audiobrowser/playlist.h
@@ -58,7 +58,7 @@ class GoogleFetcher;
 
 class GalleryDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	GalleryDialog( TQWidget *parent, GoogleFetcher *goog );
@@ -76,7 +76,7 @@ private:
 
 class RollTitle : public TQLabel
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -102,7 +102,7 @@ private slots:
 
 class CoverFrame : public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -127,7 +127,7 @@ signals:
 
 class PlayList : public KaffeineInput
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -313,7 +313,7 @@ class TQStringList;
 
 class SubtitleChooser : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	SubtitleChooser(TQStringList, TQString, TQWidget *parent=0, const char *name = 0);
@@ -327,7 +327,7 @@ private:
 
 class MovieChooser : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MovieChooser(TQStringList, TQString, TQWidget *parent=0, const char *name = 0);
diff --git a/kaffeine/src/input/audiobrowser/urllistview.h b/kaffeine/src/input/audiobrowser/urllistview.h
index 7689008..614a286 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.h
+++ b/kaffeine/src/input/audiobrowser/urllistview.h
@@ -38,7 +38,7 @@ namespace TDEIO {
 
 class UrlListView : public TDEListView
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
  UrlListView(TQWidget *parent=0, const char *name=0);
diff --git a/kaffeine/src/input/disc/cddb.h b/kaffeine/src/input/disc/cddb.h
index 2b92745..f2f76ea 100644
--- a/kaffeine/src/input/disc/cddb.h
+++ b/kaffeine/src/input/disc/cddb.h
@@ -32,7 +32,7 @@ class KExtendedSocket;
 
 class CDDB : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h
index eb271f5..52357f2 100644
--- a/kaffeine/src/input/disc/disc.h
+++ b/kaffeine/src/input/disc/disc.h
@@ -42,7 +42,7 @@ class MRL;
 
 class MLabel : public TQLabel
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -57,7 +57,7 @@ protected:
 
 class MListView : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -72,7 +72,7 @@ protected:
 
 class Disc : public KaffeineInput
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h
index 76a4035..116cfdc 100644
--- a/kaffeine/src/input/disc/paranoia.h
+++ b/kaffeine/src/input/disc/paranoia.h
@@ -47,7 +47,7 @@ extern "C"
 
 class KiloConfig : public ParanoiaSettings
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
index 61144a5..5439abe 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
+++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
@@ -33,7 +33,7 @@
 
 class KDE_EXPORT KaffeineAudioEncoder : public KParts::Part
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KaffeineAudioEncoder(TQObject* parent, const char* name);
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
index 1796020..e67dff3 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
@@ -30,7 +30,7 @@
 
 class LameSettings : public LameConfig
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	LameSettings( TQWidget *parent, TDEConfig *confile );
@@ -48,7 +48,7 @@ private:
 
 class KLameEnc : public KaffeineAudioEncoder
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
index 4096360..df66b1a 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
@@ -38,7 +38,7 @@ extern "C"
 
 class OggSettings : public OggConfig
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	OggSettings( TQWidget *parent, TDEConfig *confile );
@@ -55,7 +55,7 @@ private:
 
 class KOggEnc : public KaffeineAudioEncoder
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/audioeditor.h b/kaffeine/src/input/dvb/audioeditor.h
index 896fe5e..b0a26a9 100644
--- a/kaffeine/src/input/dvb/audioeditor.h
+++ b/kaffeine/src/input/dvb/audioeditor.h
@@ -26,7 +26,7 @@
 
 class AudioEditor : public AudioEditorUI
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 	
 public:
diff --git a/kaffeine/src/input/dvb/broadcasteditor.h b/kaffeine/src/input/dvb/broadcasteditor.h
index 190c334..e877177 100644
--- a/kaffeine/src/input/dvb/broadcasteditor.h
+++ b/kaffeine/src/input/dvb/broadcasteditor.h
@@ -30,7 +30,7 @@
 
 class BroadcastEditor : public BroadcastEditorUI
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/channeleditor.h b/kaffeine/src/input/dvb/channeleditor.h
index 03a241b..bc71288 100644
--- a/kaffeine/src/input/dvb/channeleditor.h
+++ b/kaffeine/src/input/dvb/channeleditor.h
@@ -28,7 +28,7 @@
 
 class ChannelEditor : public ChannelEditorUI
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/cleaner.h b/kaffeine/src/input/dvb/cleaner.h
index ffcebb2..18bd526 100644
--- a/kaffeine/src/input/dvb/cleaner.h
+++ b/kaffeine/src/input/dvb/cleaner.h
@@ -29,7 +29,7 @@
 class Cleaner : public TQObject, public TQThread
 {
 
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/crontimer.h b/kaffeine/src/input/dvb/crontimer.h
index 8e5b44a..8484493 100644
--- a/kaffeine/src/input/dvb/crontimer.h
+++ b/kaffeine/src/input/dvb/crontimer.h
@@ -31,7 +31,7 @@
 class CronTimer : public CronTimerUI
 {
 
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/dvbcam.h b/kaffeine/src/input/dvb/dvbcam.h
index cd1495a..23d9b23 100644
--- a/kaffeine/src/input/dvb/dvbcam.h
+++ b/kaffeine/src/input/dvb/dvbcam.h
@@ -116,7 +116,7 @@ public:
 
 class MCamMenuDialog : public CamMenuDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MCamMenuDialog( StandardCam *sc );
@@ -134,7 +134,7 @@ signals:
 
 class DvbCam : public TQObject, public TQThread
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	DvbCam(int adapter, int ca_device, int demux_device, int ci_type, int maxService);
diff --git a/kaffeine/src/input/dvb/dvbconfig.h b/kaffeine/src/input/dvb/dvbconfig.h
index 697f73d..7497aba 100644
--- a/kaffeine/src/input/dvb/dvbconfig.h
+++ b/kaffeine/src/input/dvb/dvbconfig.h
@@ -44,7 +44,7 @@ using namespace TDEIO;
 
 class MSpinBox : public TQSpinBox
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MSpinBox( TQWidget *parent, int devNum );
@@ -60,7 +60,7 @@ private:
 
 class MPushButton : public KPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MPushButton( TQWidget *parent, int devNum, int lnbNum );
@@ -77,7 +77,7 @@ private:
 
 class MCAMButton : public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MCAMButton( TQWidget *parent, int devNum );
@@ -93,7 +93,7 @@ private:
 
 class MComboBox : public TQComboBox
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	MComboBox( TQWidget *parent, int devNum, int lnbNum );
@@ -160,7 +160,7 @@ public:
 
 class DVBconfig : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -219,7 +219,7 @@ class DvbPanel;
 
 class DvbConfigDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -279,7 +279,7 @@ protected slots:
 
 class LnbConfig : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -309,7 +309,7 @@ private:
 
 class RotorConfig : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/dvbout.h b/kaffeine/src/input/dvb/dvbout.h
index 3064b7a..7e4d7e9 100644
--- a/kaffeine/src/input/dvb/dvbout.h
+++ b/kaffeine/src/input/dvb/dvbout.h
@@ -37,7 +37,7 @@ class KaffeineDvbPlugin;
 
 class DVBout : public TQObject, public TQThread
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h
index 66e388f..10e2bd3 100644
--- a/kaffeine/src/input/dvb/dvbpanel.h
+++ b/kaffeine/src/input/dvb/dvbpanel.h
@@ -55,7 +55,7 @@ class KaffeineDvbPlugin;
 
 class DListView : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	DListView( TQWidget *parent );
@@ -82,7 +82,7 @@ private:
 
 class DvbPanel : public KaffeineInput
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/dvbsi.h b/kaffeine/src/input/dvb/dvbsi.h
index aedc4be..6ea81cd 100644
--- a/kaffeine/src/input/dvb/dvbsi.h
+++ b/kaffeine/src/input/dvb/dvbsi.h
@@ -54,7 +54,7 @@ protected:
 
 class DVBsi : public TQObject, public KaffeineDVBsection
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/dvbstream.h b/kaffeine/src/input/dvb/dvbstream.h
index 86bf62d..3ccb850 100644
--- a/kaffeine/src/input/dvb/dvbstream.h
+++ b/kaffeine/src/input/dvb/dvbstream.h
@@ -47,7 +47,7 @@ class EventTable;
 
 class DvbStream : public TQObject, public TQThread
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public :
diff --git a/kaffeine/src/input/dvb/kevents.h b/kaffeine/src/input/dvb/kevents.h
index 3cd9aef..86db303 100644
--- a/kaffeine/src/input/dvb/kevents.h
+++ b/kaffeine/src/input/dvb/kevents.h
@@ -51,7 +51,7 @@ public:
 
 class KEvents : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/kgradprogress.h b/kaffeine/src/input/dvb/kgradprogress.h
index a956d6a..3b223ca 100644
--- a/kaffeine/src/input/dvb/kgradprogress.h
+++ b/kaffeine/src/input/dvb/kgradprogress.h
@@ -29,7 +29,7 @@
 class KGradProgress : public TQLabel
 {
 
-	Q_OBJECT
+	TQ_OBJECT
   
 	
 public: 
diff --git a/kaffeine/src/input/dvb/krecord.h b/kaffeine/src/input/dvb/krecord.h
index afcbe29..e942888 100644
--- a/kaffeine/src/input/dvb/krecord.h
+++ b/kaffeine/src/input/dvb/krecord.h
@@ -34,7 +34,7 @@
 
 class KRecord : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/ktimereditor.h b/kaffeine/src/input/dvb/ktimereditor.h
index 5b454d5..724254c 100644
--- a/kaffeine/src/input/dvb/ktimereditor.h
+++ b/kaffeine/src/input/dvb/ktimereditor.h
@@ -37,7 +37,7 @@
 
 class KTimerEditor : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
index 7a45286..404316d 100644
--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
+++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
@@ -133,7 +133,7 @@ private:
 
 class KDE_EXPORT EventTable : public TQObject, public TQThread
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	EventTable();
@@ -161,7 +161,7 @@ private slots:
 
 class KDE_EXPORT KaffeineEpgPlugin : public KParts::Part,  public KaffeineDVBsection
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KaffeineEpgPlugin( TQObject* parent, const char* name );
diff --git a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
index 987ec61..ca4ed64 100644
--- a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
+++ b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
@@ -33,7 +33,7 @@
 
 class KDE_EXPORT KaffeineDvbPlugin : public KParts::Part
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KaffeineDvbPlugin(TQObject* parent, const char* name);
diff --git a/kaffeine/src/input/dvb/scandialog.h b/kaffeine/src/input/dvb/scandialog.h
index 75ef123..48fd7ae 100644
--- a/kaffeine/src/input/dvb/scandialog.h
+++ b/kaffeine/src/input/dvb/scandialog.h
@@ -50,7 +50,7 @@ public:
 
 class ScanDialog : public ScanDialogUI
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/subeditor.h b/kaffeine/src/input/dvb/subeditor.h
index 4d372ee..fac68f5 100644
--- a/kaffeine/src/input/dvb/subeditor.h
+++ b/kaffeine/src/input/dvb/subeditor.h
@@ -28,7 +28,7 @@
 
 class SubEditor : public SubEditorUI
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvb/ts2rtp.h b/kaffeine/src/input/dvb/ts2rtp.h
index 15e81f8..23be0f7 100644
--- a/kaffeine/src/input/dvb/ts2rtp.h
+++ b/kaffeine/src/input/dvb/ts2rtp.h
@@ -60,7 +60,7 @@ struct rtpheader {	/* in network byte order */
 
 class Ts2Rtp : public Sender
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 
diff --git a/kaffeine/src/input/dvbclient/cdcleaner.h b/kaffeine/src/input/dvbclient/cdcleaner.h
index f6e2f29..67090e8 100644
--- a/kaffeine/src/input/dvbclient/cdcleaner.h
+++ b/kaffeine/src/input/dvbclient/cdcleaner.h
@@ -31,7 +31,7 @@
 class CdCleaner : public TQObject, public TQThread
 {
 
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvbclient/cddump.h b/kaffeine/src/input/dvbclient/cddump.h
index 9ddedab..85896f5 100644
--- a/kaffeine/src/input/dvbclient/cddump.h
+++ b/kaffeine/src/input/dvbclient/cddump.h
@@ -57,7 +57,7 @@ struct srtpheader {	/* in network byte order */
 
 class CdDump : public TQObject, public TQThread
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public :
diff --git a/kaffeine/src/input/dvbclient/cdlisten.h b/kaffeine/src/input/dvbclient/cdlisten.h
index 18b2550..44eed69 100644
--- a/kaffeine/src/input/dvbclient/cdlisten.h
+++ b/kaffeine/src/input/dvbclient/cdlisten.h
@@ -32,7 +32,7 @@
 
 class CdListen : public TQObject, public TQThread
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/dvbclient/cdwidget.h b/kaffeine/src/input/dvbclient/cdwidget.h
index 5594e68..9adb29a 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.h
+++ b/kaffeine/src/input/dvbclient/cdwidget.h
@@ -38,7 +38,7 @@
 
 class CdWidget : public KaffeineInput
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/input/kaffeineinput.h b/kaffeine/src/input/kaffeineinput.h
index b7ac642..4fa2985 100644
--- a/kaffeine/src/input/kaffeineinput.h
+++ b/kaffeine/src/input/kaffeineinput.h
@@ -30,7 +30,7 @@ class MRL;
 
 class KaffeineInput : public TQObject, public KXMLGUIClient
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KaffeineInput(TQObject* parent, const char* name);
diff --git a/kaffeine/src/inputmanager.h b/kaffeine/src/inputmanager.h
index b040660..e297677 100644
--- a/kaffeine/src/inputmanager.h
+++ b/kaffeine/src/inputmanager.h
@@ -40,7 +40,7 @@ class MRL;
 
 class PlayerContainer : public TQVBox
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -73,7 +73,7 @@ public:
 
 class InputManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	InputManager( Kaffeine *parent, TQWidgetStack *ws, KMultiTabBar *mt );
diff --git a/kaffeine/src/instwizard.h b/kaffeine/src/instwizard.h
index 3addec2..f93b00a 100644
--- a/kaffeine/src/instwizard.h
+++ b/kaffeine/src/instwizard.h
@@ -31,7 +31,7 @@ class TDEProcess;
 
 class InstWizard : private KWizard
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	static void showWizard()
diff --git a/kaffeine/src/kaffeine.h b/kaffeine/src/kaffeine.h
index 86477a1..b9381bd 100644
--- a/kaffeine/src/kaffeine.h
+++ b/kaffeine/src/kaffeine.h
@@ -55,7 +55,7 @@ extern const TDECmdLineOptions cmdLineOptions[];
 
 class Kaffeine : public TDEMainWindow, private KaffeineIface
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	Kaffeine();
diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.h b/kaffeine/src/player-parts/dummy-part/dummy_part.h
index 29b2ab2..d230595 100644
--- a/kaffeine/src/player-parts/dummy-part/dummy_part.h
+++ b/kaffeine/src/player-parts/dummy-part/dummy_part.h
@@ -34,7 +34,7 @@
 
 class DummyPart : public KaffeinePart
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
   DummyPart(TQWidget*, const char*, TQObject*, const char*, const TQStringList&);
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
index 65afe5a..0972a57 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
@@ -37,7 +37,7 @@
 
 class GStreamerPart : public KaffeinePart
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	GStreamerPart( TQWidget*, const char*, TQObject*, const char*, const TQStringList& );
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h
index c245d67..9c9c334 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h
@@ -34,7 +34,7 @@ class KLineEdit;
 
 class GStreamerConfig : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	GStreamerConfig(const TQStringList& audioDrivers, const TQStringList& videoDrivers);
diff --git a/kaffeine/src/player-parts/gstreamer-part/timer.h b/kaffeine/src/player-parts/gstreamer-part/timer.h
index d683df6..d4af916 100644
--- a/kaffeine/src/player-parts/gstreamer-part/timer.h
+++ b/kaffeine/src/player-parts/gstreamer-part/timer.h
@@ -37,7 +37,7 @@ class TQTime;
 
 class Timer : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h
index 67d55ef..b06c073 100644
--- a/kaffeine/src/player-parts/gstreamer-part/video.h
+++ b/kaffeine/src/player-parts/gstreamer-part/video.h
@@ -35,7 +35,7 @@
 
 class VideoWindow : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.h b/kaffeine/src/player-parts/gstreamer-part/videosettings.h
index 686392c..ada3263 100644
--- a/kaffeine/src/player-parts/gstreamer-part/videosettings.h
+++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.h
@@ -32,7 +32,7 @@ class TQSlider;
 class VideoSettings : public KDialogBase
 {
 
-   Q_OBJECT
+   TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
index 2ff5ffe..f0e6f67 100644
--- a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
+++ b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
@@ -37,7 +37,7 @@
 
 class KDE_EXPORT KaffeinePart : public KParts::ReadOnlyPart
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KaffeinePart(TQObject* parent, const char* name);
diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
index 6987de3..0cd1a69 100644
--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h
+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
@@ -35,7 +35,7 @@ class KPushButton;
 
 class DeinterlacerConfigDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   DeinterlacerConfigDialog(TQWidget *parent=0, const char *name=0)
@@ -54,7 +54,7 @@ private:
 };
 
 class DeinterlaceQuality : public KDialogBase  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
   DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent=0, const char *name=0);
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
index 1b2a674..522bb50 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.h
+++ b/kaffeine/src/player-parts/xine-part/equalizer.h
@@ -34,7 +34,7 @@
   */
 
 class Equalizer : public KDialogBase  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
   Equalizer(TQWidget *parent=0, const char *name=0);
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.h b/kaffeine/src/player-parts/xine-part/filterdialog.h
index febafad..7602180 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.h
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.h
@@ -34,7 +34,7 @@ class TQStringList;
 
 class FilterDialog : public KDialogBase
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
   FilterDialog(const TQStringList& audiofilters, const TQStringList& videofilters, TQWidget *parent=0, const char *name=0);
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.h b/kaffeine/src/player-parts/xine-part/kxinewidget.h
index 69a9589..4b4a581 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.h
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.h
@@ -75,7 +75,7 @@ typedef int PostFilter; /* dummy type */
 class KXineWidget : public TQWidget, public TQThread
 {
 
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/player-parts/xine-part/positionslider.h b/kaffeine/src/player-parts/xine-part/positionslider.h
index ae72b23..a604bbc 100644
--- a/kaffeine/src/player-parts/xine-part/positionslider.h
+++ b/kaffeine/src/player-parts/xine-part/positionslider.h
@@ -27,7 +27,7 @@
 
 class PositionSlider : public TQSlider
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/kaffeine/src/player-parts/xine-part/postfilter.h b/kaffeine/src/player-parts/xine-part/postfilter.h
index a7e8c8c..3da6775 100644
--- a/kaffeine/src/player-parts/xine-part/postfilter.h
+++ b/kaffeine/src/player-parts/xine-part/postfilter.h
@@ -42,7 +42,7 @@ class KPushButton;
 
 class PostFilterParameter : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   PostFilterParameter(const TQString& name, int offset, TQWidget* parent)
@@ -61,7 +61,7 @@ protected:
 
 class PostFilterParameterInt : public PostFilterParameter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   PostFilterParameterInt(const TQString& name, int offset, int value, int min, int max, TQWidget* parent);
@@ -86,7 +86,7 @@ private:
 
 class PostFilterParameterDouble : public PostFilterParameter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   PostFilterParameterDouble(const TQString& name, int offset, double value, double min, double max, TQWidget* parent);
@@ -111,7 +111,7 @@ private:
 
 class PostFilterParameterChar : public PostFilterParameter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* parent);
@@ -135,7 +135,7 @@ private:
 
 class PostFilterParameterCombo : public PostFilterParameter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* parent);
@@ -158,7 +158,7 @@ private:
 
 class PostFilterParameterBool : public PostFilterParameter
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* parent);
@@ -183,7 +183,7 @@ private:
 
 class PostFilterHelp : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   PostFilterHelp(TQWidget *parent=0, const char *name=0, const TQString& text = TQString());
@@ -196,7 +196,7 @@ private:
 
 class PostFilter : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public:
    PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* audioDriver,
diff --git a/kaffeine/src/player-parts/xine-part/screenshotpreview.h b/kaffeine/src/player-parts/xine-part/screenshotpreview.h
index 129c34e..f2e4c06 100644
--- a/kaffeine/src/player-parts/xine-part/screenshotpreview.h
+++ b/kaffeine/src/player-parts/xine-part/screenshotpreview.h
@@ -32,7 +32,7 @@ class TQWidget;
 
 class ScreenshotPreview : public KPreviewWidgetBase
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
   ScreenshotPreview(const TQImage& img, TQWidget *parent=0, const char *name=0);
diff --git a/kaffeine/src/player-parts/xine-part/videosettings.h b/kaffeine/src/player-parts/xine-part/videosettings.h
index 19fe656..afa14c7 100644
--- a/kaffeine/src/player-parts/xine-part/videosettings.h
+++ b/kaffeine/src/player-parts/xine-part/videosettings.h
@@ -32,7 +32,7 @@ class TQSlider;
 class VideoSettings : public KDialogBase
 {
 
-   Q_OBJECT
+   TQ_OBJECT
   
    
 public: 
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h
index a4c212f..2afcab5 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.h
+++ b/kaffeine/src/player-parts/xine-part/xine_part.h
@@ -55,7 +55,7 @@ class TDEPopupMenu;
  */
 class XinePart : public KaffeinePart, public XinePartIface
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	XinePart(TQWidget*, const char*, TQObject*, const char*, const TQStringList&);
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.h b/kaffeine/src/player-parts/xine-part/xineconfig.h
index 2585f1c..5c18964 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.h
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.h
@@ -39,7 +39,7 @@ class TQGridLayout;
 /* stores a single config entry of the config file */
 class XineConfigEntry : public TQHBox
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row, xine_cfg_entry_t* entry);
@@ -76,7 +76,7 @@ private:
 
 class XineConfig : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	XineConfig(const xine_t* const xine);
diff --git a/kaffeine/src/pref.h b/kaffeine/src/pref.h
index 1c9fe29..fa872fc 100644
--- a/kaffeine/src/pref.h
+++ b/kaffeine/src/pref.h
@@ -36,7 +36,7 @@ class TQLineEdit;
 
 class KaffeinePreferences : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/startwindow.h b/kaffeine/src/startwindow.h
index fd0eeab..0e119d8 100644
--- a/kaffeine/src/startwindow.h
+++ b/kaffeine/src/startwindow.h
@@ -33,7 +33,7 @@
 
 class MToolButton : public TQToolButton
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -53,7 +53,7 @@ signals:
 
 class SLabel : public TQLabel
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
@@ -68,7 +68,7 @@ protected:
 
 class StartWindow : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 
 public:
diff --git a/kaffeine/src/systemtray.h b/kaffeine/src/systemtray.h
index 54d3c83..f9c8bc3 100644
--- a/kaffeine/src/systemtray.h
+++ b/kaffeine/src/systemtray.h
@@ -38,7 +38,7 @@ class TitleLabel;
 class TQTimer;  
 
 class SystemTray : public KSystemTray  {
-   Q_OBJECT
+   TQ_OBJECT
   
 public: 
   SystemTray(TQWidget *parent = 0, const char *name = 0);
diff --git a/kaffeine/src/tdemultitabbar.h b/kaffeine/src/tdemultitabbar.h
index ccb9884..789dde9 100644
--- a/kaffeine/src/tdemultitabbar.h
+++ b/kaffeine/src/tdemultitabbar.h
@@ -52,7 +52,7 @@ class KMultiTabBarInternal;
  */
 class /*TDEUTILS_EXPORT*/ KMultiTabBar: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	enum KMultiTabBarMode{Horizontal, Vertical};
@@ -155,7 +155,7 @@ private:
  */
 class /*TDEUTILS_EXPORT*/ KMultiTabBarButton: public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
@@ -208,7 +208,7 @@ protected slots:
  */
 class /*TDEUTILS_EXPORT*/ KMultiTabBarTab: public KMultiTabBarButton
 {
-	Q_OBJECT
+	TQ_OBJECT
   
 public:
 	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
diff --git a/kaffeine/src/tdemultitabbar_p.h b/kaffeine/src/tdemultitabbar_p.h
index c7fe1d8..f0ea80e 100644
--- a/kaffeine/src/tdemultitabbar_p.h
+++ b/kaffeine/src/tdemultitabbar_p.h
@@ -30,7 +30,7 @@
 
 class KMultiTabBarInternal: public TQScrollView
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 public:
         KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
diff --git a/kaffeine/terminate.patch b/kaffeine/terminate.patch
index fd0d17e..28ed232 100644
--- a/kaffeine/terminate.patch
+++ b/kaffeine/terminate.patch
@@ -242,7 +242,7 @@ diff -ru kaffeine-0.8.4.cvs.orig/kaffeine/src/input/dvb/dvbout.h kaffeine-0.8.4.
 -class DVBout : public QObject, public QThread
 +class DVBout : public QObject, private QThread
  {
- 	Q_OBJECT
+ 	TQ_OBJECT
 
 @@ -77,13 +77,13 @@
  	void writePat();