Remove spurious TQ_OBJECT instances

60 files changed, 94 insertions, 94 deletions

diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.h b/kaffeine/src/input/audiobrowser/googlefetcher.h
index 22697cf..caee57a 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcher.h
+++ b/kaffeine/src/input/audiobrowser/googlefetcher.h
@@ -54,7 +54,7 @@ typedef TQValueList<GoogleImage> GoogleImageList;
 class GoogleFetcher : public TQObject
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     enum ImageSize { All, Icon, Small, Medium, Large, XLarge };
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
index d53ca09..6d1c0c6 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
@@ -31,7 +31,7 @@ class KURL;
 class GoogleFetcherDialog : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     GoogleFetcherDialog(const TQString &name,
@@ -82,7 +82,7 @@ namespace KIO
 class CoverIconViewItem : public TQObject, public KIconViewItem
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     CoverIconViewItem(TQIconView *parent, const GoogleImage &image);
diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
index 7be7a6d..75ccf88 100644
--- a/kaffeine/src/input/audiobrowser/playlist.h
+++ b/kaffeine/src/input/audiobrowser/playlist.h
@@ -59,7 +59,7 @@ class GoogleFetcher;
 class GalleryDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GalleryDialog( TQWidget *parent, GoogleFetcher *goog );
 protected slots:
@@ -77,7 +77,7 @@ private:
 class RollTitle : public TQLabel
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	RollTitle( TQWidget *parent );
@@ -103,7 +103,7 @@ private slots:
 class CoverFrame : public TQFrame
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	CoverFrame( TQWidget *parent );
@@ -128,7 +128,7 @@ signals:
 class PlayList : public KaffeineInput
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	PlayList(TQWidget *parent, TQObject *objParent, const char *name=0);
@@ -314,7 +314,7 @@ class TQStringList;
 class SubtitleChooser : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SubtitleChooser(TQStringList, TQString, TQWidget *parent=0, const char *name = 0);
 	virtual ~SubtitleChooser();
@@ -328,7 +328,7 @@ private:
 class MovieChooser : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MovieChooser(TQStringList, TQString, TQWidget *parent=0, const char *name = 0);
 	virtual ~MovieChooser();
diff --git a/kaffeine/src/input/audiobrowser/urllistview.h b/kaffeine/src/input/audiobrowser/urllistview.h
index 8f745a7..68cb6ed 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.h
+++ b/kaffeine/src/input/audiobrowser/urllistview.h
@@ -37,7 +37,7 @@ class KIO::Job;
 class UrlListView : public KListView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
  UrlListView(TQWidget *parent=0, const char *name=0);
  ~UrlListView();
diff --git a/kaffeine/src/input/disc/cddb.h b/kaffeine/src/input/disc/cddb.h
index a9d0657..2b92745 100644
--- a/kaffeine/src/input/disc/cddb.h
+++ b/kaffeine/src/input/disc/cddb.h
@@ -33,7 +33,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 129041d..26da1da 100644
--- a/kaffeine/src/input/disc/disc.h
+++ b/kaffeine/src/input/disc/disc.h
@@ -43,7 +43,7 @@ class MRL;
 class MLabel : public TQLabel
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	MLabel( TQWidget *parent );
@@ -58,7 +58,7 @@ protected:
 class MListView : public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	MListView( TQWidget *parent );
@@ -73,7 +73,7 @@ protected:
 class Disc : public KaffeineInput
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	Disc(TQWidget *parent, TQObject *objParent, const char *name=0);
diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h
index f54d010..7311d4b 100644
--- a/kaffeine/src/input/disc/paranoia.h
+++ b/kaffeine/src/input/disc/paranoia.h
@@ -39,7 +39,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 f7f3c42..74e2ca4 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
+++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
@@ -34,7 +34,7 @@
 class KDE_EXPORT KaffeineAudioEncoder : public KParts::Part
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KaffeineAudioEncoder(TQObject* parent, const char* name);
 	virtual ~KaffeineAudioEncoder();
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
index 033f448..245c40c 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
@@ -31,7 +31,7 @@
 class LameSettings : public LameConfig
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	LameSettings( TQWidget *parent, KConfig *confile );
 	~LameSettings();
@@ -49,7 +49,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 f495cbf..46fb736 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
@@ -39,7 +39,7 @@ extern "C"
 class OggSettings : public OggConfig
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	OggSettings( TQWidget *parent, KConfig *confile );
 	~OggSettings();
@@ -56,7 +56,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 0e1c83a..896fe5e 100644
--- a/kaffeine/src/input/dvb/audioeditor.h
+++ b/kaffeine/src/input/dvb/audioeditor.h
@@ -27,7 +27,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 daddc52..190c334 100644
--- a/kaffeine/src/input/dvb/broadcasteditor.h
+++ b/kaffeine/src/input/dvb/broadcasteditor.h
@@ -31,7 +31,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 772e36a..03a241b 100644
--- a/kaffeine/src/input/dvb/channeleditor.h
+++ b/kaffeine/src/input/dvb/channeleditor.h
@@ -29,7 +29,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 5132c1f..ffcebb2 100644
--- a/kaffeine/src/input/dvb/cleaner.h
+++ b/kaffeine/src/input/dvb/cleaner.h
@@ -30,7 +30,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 c029abe..8e5b44a 100644
--- a/kaffeine/src/input/dvb/crontimer.h
+++ b/kaffeine/src/input/dvb/crontimer.h
@@ -32,7 +32,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 01832bf..cd1495a 100644
--- a/kaffeine/src/input/dvb/dvbcam.h
+++ b/kaffeine/src/input/dvb/dvbcam.h
@@ -117,7 +117,7 @@ public:
 class MCamMenuDialog : public CamMenuDialog
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MCamMenuDialog( StandardCam *sc );
 private:
@@ -135,7 +135,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);
 	~DvbCam();
diff --git a/kaffeine/src/input/dvb/dvbconfig.h b/kaffeine/src/input/dvb/dvbconfig.h
index 89f4adb..84110bf 100644
--- a/kaffeine/src/input/dvb/dvbconfig.h
+++ b/kaffeine/src/input/dvb/dvbconfig.h
@@ -45,7 +45,7 @@ using namespace KIO;
 class MSpinBox : public TQSpinBox
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MSpinBox( TQWidget *parent, int devNum );
 public slots:
@@ -61,7 +61,7 @@ private:
 class MPushButton : public KPushButton
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MPushButton( TQWidget *parent, int devNum, int lnbNum );
 private slots:
@@ -78,7 +78,7 @@ private:
 class MCAMButton : public TQPushButton
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MCAMButton( TQWidget *parent, int devNum );
 private slots:
@@ -94,7 +94,7 @@ private:
 class MComboBox : public TQComboBox
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MComboBox( TQWidget *parent, int devNum, int lnbNum );
 private slots:
@@ -161,7 +161,7 @@ public:
 class DVBconfig : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
@@ -220,7 +220,7 @@ class DvbPanel;
 class DvbConfigDialog : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
@@ -280,7 +280,7 @@ protected slots:
 class LnbConfig : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 
@@ -310,7 +310,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 b52e511..3064b7a 100644
--- a/kaffeine/src/input/dvb/dvbout.h
+++ b/kaffeine/src/input/dvb/dvbout.h
@@ -38,7 +38,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 4dbf554..49f461b 100644
--- a/kaffeine/src/input/dvb/dvbpanel.h
+++ b/kaffeine/src/input/dvb/dvbpanel.h
@@ -56,7 +56,7 @@ class KaffeineDvbPlugin;
 class DListView : public KListView
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	DListView( TQWidget *parent );
 
@@ -83,7 +83,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 0fe8999..aedc4be 100644
--- a/kaffeine/src/input/dvb/dvbsi.h
+++ b/kaffeine/src/input/dvb/dvbsi.h
@@ -55,7 +55,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 1d2d780..86bf62d 100644
--- a/kaffeine/src/input/dvb/dvbstream.h
+++ b/kaffeine/src/input/dvb/dvbstream.h
@@ -48,7 +48,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 d960575..62a6ce6 100644
--- a/kaffeine/src/input/dvb/kevents.h
+++ b/kaffeine/src/input/dvb/kevents.h
@@ -52,7 +52,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 84aeee0..a956d6a 100644
--- a/kaffeine/src/input/dvb/kgradprogress.h
+++ b/kaffeine/src/input/dvb/kgradprogress.h
@@ -30,7 +30,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 e374baf..5e21691 100644
--- a/kaffeine/src/input/dvb/krecord.h
+++ b/kaffeine/src/input/dvb/krecord.h
@@ -35,7 +35,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 7d294f9..5b454d5 100644
--- a/kaffeine/src/input/dvb/ktimereditor.h
+++ b/kaffeine/src/input/dvb/ktimereditor.h
@@ -38,7 +38,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 78874ca..c81e1a4 100644
--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
+++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
@@ -132,7 +132,7 @@ private:
 class EventTable : public TQObject, public TQThread
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	EventTable();
 	~EventTable();
@@ -160,7 +160,7 @@ private slots:
 class KDE_EXPORT KaffeineEpgPlugin : public KParts::Part,  public KaffeineDVBsection
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KaffeineEpgPlugin( TQObject* parent, const char* name );
 	virtual ~KaffeineEpgPlugin();
diff --git a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
index 7784fc3..06f24ae 100644
--- a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
+++ b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
@@ -34,7 +34,7 @@
 class KDE_EXPORT KaffeineDvbPlugin : public KParts::Part
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KaffeineDvbPlugin(TQObject* parent, const char* name);
 	virtual ~KaffeineDvbPlugin();
diff --git a/kaffeine/src/input/dvb/scandialog.h b/kaffeine/src/input/dvb/scandialog.h
index e3dee76..75ef123 100644
--- a/kaffeine/src/input/dvb/scandialog.h
+++ b/kaffeine/src/input/dvb/scandialog.h
@@ -51,7 +51,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 71b07a8..4d372ee 100644
--- a/kaffeine/src/input/dvb/subeditor.h
+++ b/kaffeine/src/input/dvb/subeditor.h
@@ -29,7 +29,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 57ff246..15e81f8 100644
--- a/kaffeine/src/input/dvb/ts2rtp.h
+++ b/kaffeine/src/input/dvb/ts2rtp.h
@@ -61,7 +61,7 @@ struct rtpheader {	/* in network byte order */
 class Ts2Rtp : public Sender
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 
 	Ts2Rtp();
diff --git a/kaffeine/src/input/dvbclient/cdcleaner.h b/kaffeine/src/input/dvbclient/cdcleaner.h
index 0f20bd5..f6e2f29 100644
--- a/kaffeine/src/input/dvbclient/cdcleaner.h
+++ b/kaffeine/src/input/dvbclient/cdcleaner.h
@@ -32,7 +32,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 27be1b8..9ddedab 100644
--- a/kaffeine/src/input/dvbclient/cddump.h
+++ b/kaffeine/src/input/dvbclient/cddump.h
@@ -58,7 +58,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 3ae95e0..18b2550 100644
--- a/kaffeine/src/input/dvbclient/cdlisten.h
+++ b/kaffeine/src/input/dvbclient/cdlisten.h
@@ -33,7 +33,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 16d01b8..4a48d9f 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.h
+++ b/kaffeine/src/input/dvbclient/cdwidget.h
@@ -39,7 +39,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 02ae996..b7ac642 100644
--- a/kaffeine/src/input/kaffeineinput.h
+++ b/kaffeine/src/input/kaffeineinput.h
@@ -31,7 +31,7 @@ class MRL;
 class KaffeineInput : public TQObject, public KXMLGUIClient
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KaffeineInput(TQObject* parent, const char* name);
 	virtual ~KaffeineInput();
diff --git a/kaffeine/src/inputmanager.h b/kaffeine/src/inputmanager.h
index bc6cf7e..b040660 100644
--- a/kaffeine/src/inputmanager.h
+++ b/kaffeine/src/inputmanager.h
@@ -41,7 +41,7 @@ class MRL;
 class PlayerContainer : public TQVBox
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	PlayerContainer(TQWidget* parent = 0, const char* name = 0);
@@ -74,7 +74,7 @@ public:
 class InputManager : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	InputManager( Kaffeine *parent, TQWidgetStack *ws, KMultiTabBar *mt );
 	~InputManager();
diff --git a/kaffeine/src/instwizard.h b/kaffeine/src/instwizard.h
index a85b643..520e071 100644
--- a/kaffeine/src/instwizard.h
+++ b/kaffeine/src/instwizard.h
@@ -32,7 +32,7 @@ class KProcess;
 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 4496d93..f96ebd8 100644
--- a/kaffeine/src/kaffeine.h
+++ b/kaffeine/src/kaffeine.h
@@ -56,7 +56,7 @@ extern const KCmdLineOptions cmdLineOptions[];
 class Kaffeine : public KMainWindow, private KaffeineIface
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Kaffeine();
 	virtual ~Kaffeine();
diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
index bc9a615..72fa884 100644
--- a/kaffeine/src/kmultitabbar.h
+++ b/kaffeine/src/kmultitabbar.h
@@ -53,7 +53,7 @@ class KMultiTabBarInternal;
 class /*KUTILS_EXPORT*/ KMultiTabBar: public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	enum KMultiTabBarMode{Horizontal,Vertical};
 	enum KMultiTabBarPosition{Left, Right, Top, Bottom};
@@ -156,7 +156,7 @@ private:
 class /*KUTILS_EXPORT*/ KMultiTabBarButton: public TQPushButton
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
 		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
@@ -209,7 +209,7 @@ protected slots:
 class /*KUTILS_EXPORT*/ KMultiTabBarTab: public KMultiTabBarButton
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
 		KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style);
diff --git a/kaffeine/src/kmultitabbar_p.h b/kaffeine/src/kmultitabbar_p.h
index 4a5ce77..d2c64db 100644
--- a/kaffeine/src/kmultitabbar_p.h
+++ b/kaffeine/src/kmultitabbar_p.h
@@ -31,7 +31,7 @@
 class KMultiTabBarInternal: public TQScrollView
 {
         Q_OBJECT
-  TQ_OBJECT
+  
 public:
         KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
         int appendTab(const TQPixmap &,int=-1,const TQString& =TQString());
diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.h b/kaffeine/src/player-parts/dummy-part/dummy_part.h
index 413d327..befb40b 100644
--- a/kaffeine/src/player-parts/dummy-part/dummy_part.h
+++ b/kaffeine/src/player-parts/dummy-part/dummy_part.h
@@ -35,7 +35,7 @@
 class DummyPart : public KaffeinePart
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DummyPart(TQWidget*, const char*, TQObject*, const char*, const TQStringList&);
   virtual ~DummyPart();
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
index 873b1cf..f8acd14 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.h
@@ -38,7 +38,7 @@
 class GStreamerPart : public KaffeinePart
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GStreamerPart( TQWidget*, const char*, TQObject*, const char*, const TQStringList& );
 	virtual ~GStreamerPart();
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h
index 86d21b5..c245d67 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.h
@@ -35,7 +35,7 @@ class KLineEdit;
 class GStreamerConfig : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	GStreamerConfig(const TQStringList& audioDrivers, const TQStringList& videoDrivers);
 	~GStreamerConfig();
diff --git a/kaffeine/src/player-parts/gstreamer-part/timer.h b/kaffeine/src/player-parts/gstreamer-part/timer.h
index dd7506a..d683df6 100644
--- a/kaffeine/src/player-parts/gstreamer-part/timer.h
+++ b/kaffeine/src/player-parts/gstreamer-part/timer.h
@@ -38,7 +38,7 @@ class TQTime;
 class Timer : public TQObject
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	Timer();
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h
index 5782936..c4d9f74 100644
--- a/kaffeine/src/player-parts/gstreamer-part/video.h
+++ b/kaffeine/src/player-parts/gstreamer-part/video.h
@@ -36,7 +36,7 @@
 class VideoWindow : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	VideoWindow( TQWidget *parent, GstElement *element );
diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.h b/kaffeine/src/player-parts/gstreamer-part/videosettings.h
index f1be1ef..686392c 100644
--- a/kaffeine/src/player-parts/gstreamer-part/videosettings.h
+++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.h
@@ -33,7 +33,7 @@ class VideoSettings : public KDialogBase
 {
 
    Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   VideoSettings(int hue, int sat, int contr, int bright, TQWidget *parent=0, const char *name=0);
diff --git a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
index 6b9e2aa..199ead6 100644
--- a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
+++ b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
@@ -38,7 +38,7 @@
 class KDE_EXPORT KaffeinePart : public KParts::ReadOnlyPart
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KaffeinePart(TQObject* parent, const char* name);
 	virtual ~KaffeinePart();
diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
index 536a998..edc2fa9 100644
--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h
+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
@@ -36,7 +36,7 @@ class KPushButton;
 class DeinterlacerConfigDialog : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   DeinterlacerConfigDialog(TQWidget *parent=0, const char *name=0)
   : KDialogBase( parent, name, true, i18n("Configure tvtime Deinterlace Plugin"), KDialogBase::Close )
@@ -55,7 +55,7 @@ private:
 
 class DeinterlaceQuality : public KDialogBase  {
    Q_OBJECT
-  TQ_OBJECT
+  
 public: 
   DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent=0, const char *name=0);
   ~DeinterlaceQuality();  
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
index 50ee8e9..7d43ec0 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.h
+++ b/kaffeine/src/player-parts/xine-part/equalizer.h
@@ -35,7 +35,7 @@
 
 class Equalizer : public KDialogBase  {
    Q_OBJECT
-  TQ_OBJECT
+  
 public: 
   Equalizer(TQWidget *parent=0, const char *name=0);
   ~Equalizer();
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.h b/kaffeine/src/player-parts/xine-part/filterdialog.h
index 7b28fa4..febafad 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.h
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.h
@@ -35,7 +35,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);
   ~FilterDialog();
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.h b/kaffeine/src/player-parts/xine-part/kxinewidget.h
index 62fef7c..69a9589 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.h
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.h
@@ -76,7 +76,7 @@ class KXineWidget : public TQWidget, public TQThread
 {
 
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KXineWidget(TQWidget *parent=0, const char *name=0,
diff --git a/kaffeine/src/player-parts/xine-part/positionslider.h b/kaffeine/src/player-parts/xine-part/positionslider.h
index 805b0b3..ae72b23 100644
--- a/kaffeine/src/player-parts/xine-part/positionslider.h
+++ b/kaffeine/src/player-parts/xine-part/positionslider.h
@@ -28,7 +28,7 @@
 class PositionSlider : public TQSlider
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
   PositionSlider(Qt::Orientation, TQWidget * parent = 0, const char* name = 0);
diff --git a/kaffeine/src/player-parts/xine-part/postfilter.h b/kaffeine/src/player-parts/xine-part/postfilter.h
index 5dabb39..a7e8c8c 100644
--- a/kaffeine/src/player-parts/xine-part/postfilter.h
+++ b/kaffeine/src/player-parts/xine-part/postfilter.h
@@ -43,7 +43,7 @@ class KPushButton;
 class PostFilterParameter : public TQObject
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PostFilterParameter(const TQString& name, int offset, TQWidget* parent)
                       : TQObject(parent, name.ascii()), m_offset(offset)
@@ -62,7 +62,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);
   ~PostFilterParameterInt() {};
@@ -87,7 +87,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);
   ~PostFilterParameterDouble() {};
@@ -112,7 +112,7 @@ private:
 class PostFilterParameterChar : public PostFilterParameter
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* parent);
   ~PostFilterParameterChar() {};
@@ -136,7 +136,7 @@ private:
 class PostFilterParameterCombo : public PostFilterParameter
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* parent);
   ~PostFilterParameterCombo() {};
@@ -159,7 +159,7 @@ private:
 class PostFilterParameterBool : public PostFilterParameter
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* parent);
   ~PostFilterParameterBool() {};
@@ -184,7 +184,7 @@ private:
 class PostFilterHelp : public KDialogBase
 {
   Q_OBJECT
-  TQ_OBJECT
+  
 public:
   PostFilterHelp(TQWidget *parent=0, const char *name=0, const TQString& text = TQString());
   ~PostFilterHelp();
@@ -197,7 +197,7 @@ private:
 class PostFilter : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* audioDriver,
               xine_video_port_t* videoDriver, TQWidget *parent);
diff --git a/kaffeine/src/player-parts/xine-part/screenshotpreview.h b/kaffeine/src/player-parts/xine-part/screenshotpreview.h
index 239e011..129c34e 100644
--- a/kaffeine/src/player-parts/xine-part/screenshotpreview.h
+++ b/kaffeine/src/player-parts/xine-part/screenshotpreview.h
@@ -33,7 +33,7 @@ class TQWidget;
 class ScreenshotPreview : public KPreviewWidgetBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public: 
   ScreenshotPreview(const TQImage& img, TQWidget *parent=0, const char *name=0);
   ~ScreenshotPreview();
diff --git a/kaffeine/src/player-parts/xine-part/videosettings.h b/kaffeine/src/player-parts/xine-part/videosettings.h
index 12d367e..19fe656 100644
--- a/kaffeine/src/player-parts/xine-part/videosettings.h
+++ b/kaffeine/src/player-parts/xine-part/videosettings.h
@@ -33,7 +33,7 @@ class VideoSettings : public KDialogBase
 {
 
    Q_OBJECT
-  TQ_OBJECT
+  
    
 public: 
   VideoSettings(int hue, int sat, int contrast, int bright, int avOffset,
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h
index 07bf027..9013e17 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.h
+++ b/kaffeine/src/player-parts/xine-part/xine_part.h
@@ -56,7 +56,7 @@ class KPopupMenu;
 class XinePart : public KaffeinePart, public XinePartIface
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	XinePart(TQWidget*, const char*, TQObject*, const char*, const TQStringList&);
 	virtual ~XinePart();
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.h b/kaffeine/src/player-parts/xine-part/xineconfig.h
index f6e1487..2585f1c 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.h
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.h
@@ -40,7 +40,7 @@ class TQGridLayout;
 class XineConfigEntry : public TQHBox
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row, xine_cfg_entry_t* entry);
 	~XineConfigEntry();
@@ -77,7 +77,7 @@ private:
 class XineConfig : public KDialogBase
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	XineConfig(const xine_t* const xine);
 	~XineConfig();
diff --git a/kaffeine/src/pref.h b/kaffeine/src/pref.h
index da9e36e..1c9fe29 100644
--- a/kaffeine/src/pref.h
+++ b/kaffeine/src/pref.h
@@ -37,7 +37,7 @@ class TQLineEdit;
 class KaffeinePreferences : public KDialogBase
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
   KaffeinePreferences();
diff --git a/kaffeine/src/startwindow.h b/kaffeine/src/startwindow.h
index f470b3c..fd0eeab 100644
--- a/kaffeine/src/startwindow.h
+++ b/kaffeine/src/startwindow.h
@@ -34,7 +34,7 @@
 class MToolButton : public TQToolButton
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	MToolButton( TQWidget *parent, const TQString& targ );
@@ -54,7 +54,7 @@ signals:
 class SLabel : public TQLabel
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	SLabel( TQWidget *parent );
@@ -69,7 +69,7 @@ protected:
 class StartWindow : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	StartWindow( TQWidget *parent = 0, const char *name = 0 );
diff --git a/kaffeine/src/systemtray.h b/kaffeine/src/systemtray.h
index 5787fd4..54d3c83 100644
--- a/kaffeine/src/systemtray.h
+++ b/kaffeine/src/systemtray.h
@@ -39,7 +39,7 @@ class TQTimer;
 
 class SystemTray : public KSystemTray  {
    Q_OBJECT
-  TQ_OBJECT
+  
 public: 
   SystemTray(TQWidget *parent = 0, const char *name = 0);
   virtual ~SystemTray();