Remove spurious TQ_OBJECT instances

73 files changed, 100 insertions, 100 deletions

diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h
index c5e18027..f7fbcd0d 100644
--- a/noatun/library/cmodule.h
+++ b/noatun/library/cmodule.h
@@ -22,7 +22,7 @@ class KURLRequester;
 class General : public CModule
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	General(TQObject *parent=0);
 	virtual void save();
diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h
index 3b371921..718a2e82 100644
--- a/noatun/library/effectview.h
+++ b/noatun/library/effectview.h
@@ -36,7 +36,7 @@ class TQToolButton;
 class EffectView : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	EffectView();
 
@@ -75,7 +75,7 @@ private:
 class EffectList : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	EffectList(TQWidget *parent);
 	virtual bool acceptDrag(TQDropEvent *) const;
diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h
index 1f881742..569417a0 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -17,7 +17,7 @@ class EqualizerWidget;
 class EqualizerLevel : public TQWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	EqualizerLevel(TQWidget *parent, VBand band);
 
@@ -37,7 +37,7 @@ private:
 class PresetList : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PresetList(TQWidget *parent, const char *name=0);
 
@@ -49,7 +49,7 @@ public:
 class EqualizerView : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 	TQPtrList<EqualizerLevel> mBands;
 
 public:
diff --git a/noatun/library/globalvideo.h b/noatun/library/globalvideo.h
index 8203282d..9414ca33 100644
--- a/noatun/library/globalvideo.h
+++ b/noatun/library/globalvideo.h
@@ -7,7 +7,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 818f63c7..42df2b72 100644
--- a/noatun/library/mimetypetree.h
+++ b/noatun/library/mimetypetree.h
@@ -19,7 +19,7 @@
 class MimeTypeTree : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MimeTypeTree(TQWidget *parent);
 
diff --git a/noatun/library/noatun/app.h b/noatun/library/noatun/app.h
index 8e8b0e1b..e337ddd9 100644
--- a/noatun/library/noatun/app.h
+++ b/noatun/library/noatun/app.h
@@ -31,7 +31,7 @@ namespace NoatunStdAction
 class KDE_EXPORT NoatunApp : public KUniqueApplication
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class Playlist;
 
 public:
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index fad688fa..3e5f00c4 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -23,7 +23,7 @@ class TQLabel;
 class KDE_EXPORT L33tSlider : public TQSlider
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	L33tSlider(TQWidget * parent, const char * name=0);
 	L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0);
@@ -57,7 +57,7 @@ private:
 class SliderAction : public KAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	SliderAction(const TQString& text, int accel, const TQObject *receiver,
 	             const char *member, TQObject* parent, const char* name );
diff --git a/noatun/library/noatun/downloader.h b/noatun/library/noatun/downloader.h
index 3fffc772..19b1d30d 100644
--- a/noatun/library/noatun/downloader.h
+++ b/noatun/library/noatun/downloader.h
@@ -66,7 +66,7 @@ private:
 class Downloader : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 	struct QueueItem
 	{
 		DownloadItem *notifier;
diff --git a/noatun/library/noatun/effects.h b/noatun/library/noatun/effects.h
index 0480729d..73e5444f 100644
--- a/noatun/library/noatun/effects.h
+++ b/noatun/library/noatun/effects.h
@@ -97,7 +97,7 @@ private:
 class Effects : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class Effect;
 public:
 	Effects();
diff --git a/noatun/library/noatun/engine.h b/noatun/library/noatun/engine.h
index 19e28dde..7be41d45 100644
--- a/noatun/library/noatun/engine.h
+++ b/noatun/library/noatun/engine.h
@@ -33,7 +33,7 @@ class NoatunApp;
 class KDE_EXPORT Engine : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class NoatunApp;
 public:
 	Engine(TQObject *parent=0);
diff --git a/noatun/library/noatun/equalizer.h b/noatun/library/noatun/equalizer.h
index 744958b3..a654fd13 100644
--- a/noatun/library/noatun/equalizer.h
+++ b/noatun/library/noatun/equalizer.h
@@ -106,7 +106,7 @@ friend class Preset;
 friend class Engine;
 
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Equalizer();
 	~Equalizer();
diff --git a/noatun/library/noatun/player.h b/noatun/library/noatun/player.h
index ef65b648..c4821d0f 100644
--- a/noatun/library/noatun/player.h
+++ b/noatun/library/noatun/player.h
@@ -22,7 +22,7 @@ class KLibrary;
 class KDE_EXPORT Player : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class Effects;
 friend class PlaylistItemData;
 friend class PlaylistNotifier;
diff --git a/noatun/library/noatun/playlist.h b/noatun/library/noatun/playlist.h
index 6c390e77..2bc0f763 100644
--- a/noatun/library/noatun/playlist.h
+++ b/noatun/library/noatun/playlist.h
@@ -329,7 +329,7 @@ private:
 class Playlist : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 	friend class PlaylistItemData;
 public:
 	Playlist(TQObject *parent, const char *name);
diff --git a/noatun/library/noatun/plugin.h b/noatun/library/noatun/plugin.h
index a79c05aa..14b53ec8 100644
--- a/noatun/library/noatun/plugin.h
+++ b/noatun/library/noatun/plugin.h
@@ -405,7 +405,7 @@ class NoatunListenerNotif;
 class NoatunListener : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class NoatunListenerNotif;
 
 public:
@@ -454,7 +454,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 fe29fdf1..07275b56 100644
--- a/noatun/library/noatun/pref.h
+++ b/noatun/library/noatun/pref.h
@@ -13,7 +13,7 @@ class CModule;
 class NoatunPreferences : public KDialogBase
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class CModule;
 
 public:
@@ -57,7 +57,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 de5bf276..f2be37ee 100644
--- a/noatun/library/noatun/scrollinglabel.h
+++ b/noatun/library/noatun/scrollinglabel.h
@@ -31,7 +31,7 @@
 class ScrollingLabel : public TQWidget
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 
 	public:
 		ScrollingLabel(const TQString &initialText,TQWidget *parent,
diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h
index b0e30098..9f9b639e 100644
--- a/noatun/library/noatun/stdaction.h
+++ b/noatun/library/noatun/stdaction.h
@@ -20,7 +20,7 @@ namespace NoatunStdAction
 class PlayAction : public KAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PlayAction(TQObject *parent, const char *name);
 private slots:
@@ -34,7 +34,7 @@ private slots:
 class PlaylistAction : public KToggleAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PlaylistAction(TQObject *parent, const char *name);
 private slots:
@@ -49,7 +49,7 @@ private slots:
 class PluginActionMenu : public KActionMenu
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	PluginActionMenu(TQObject *parent, const char *name);
 	/**
@@ -83,7 +83,7 @@ private:
 class VisActionMenu : public KActionMenu
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	VisActionMenu(TQObject *parent, const char *name);
 private slots:
@@ -101,7 +101,7 @@ private:
 class LoopActionMenu : public KActionMenu
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	LoopActionMenu(TQObject *parent, const char *name);
 private slots:
diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h
index ac85b9ed..6e5312f9 100644
--- a/noatun/library/noatun/stereobuttonaction.h
+++ b/noatun/library/noatun/stereobuttonaction.h
@@ -13,7 +13,7 @@ namespace NoatunStdAction
 class StereoButtonAction : public KAction
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	StereoButtonAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0 );
 	StereoButtonAction(const TQString& text, int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 );
diff --git a/noatun/library/noatun/vequalizer.h b/noatun/library/noatun/vequalizer.h
index 5e494472..f28fb4e1 100644
--- a/noatun/library/noatun/vequalizer.h
+++ b/noatun/library/noatun/vequalizer.h
@@ -137,7 +137,7 @@ public:
 class KDE_EXPORT VInterpolation : public TQObject, public VBandsInterface
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	struct Private;
 	Private *d;
 	friend class VBand;
@@ -177,7 +177,7 @@ class VPreset;
 class KDE_EXPORT VEqualizer : public TQObject, public VBandsInterface
 {
 	Q_OBJECT
-  TQ_OBJECT
+  
 	friend class VBand;
 	friend class VPreset;
 	friend class Engine;
diff --git a/noatun/library/noatun/video.h b/noatun/library/noatun/video.h
index bed8f8ac..ece120fe 100644
--- a/noatun/library/noatun/video.h
+++ b/noatun/library/noatun/video.h
@@ -12,7 +12,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 cf336c7d..c48727ea 100644
--- a/noatun/library/noatuntags/tagsgetter.h
+++ b/noatun/library/noatuntags/tagsgetter.h
@@ -10,7 +10,7 @@
 class TagsGetter : public TQObject, public PlaylistNotifier
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	TagsGetter();
 	void associate(Tags *t);
@@ -48,7 +48,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 e52e73c1..777c70e3 100644
--- a/noatun/library/plugin_deps.h
+++ b/noatun/library/plugin_deps.h
@@ -12,7 +12,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 c3818040..d29fe1d1 100644
--- a/noatun/library/pluginmodule.h
+++ b/noatun/library/pluginmodule.h
@@ -51,7 +51,7 @@ private:
 class PluginListView : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 friend class PluginListItem;
 
@@ -76,7 +76,7 @@ private:
 class Plugins : public CModule
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Plugins(TQObject *_parent = 0);
 	virtual void save();
diff --git a/noatun/library/titleproxy.h b/noatun/library/titleproxy.h
index 21f9528d..2bb13243 100644
--- a/noatun/library/titleproxy.h
+++ b/noatun/library/titleproxy.h
@@ -49,7 +49,7 @@ namespace TitleProxy
     class Proxy : public TQObject
     {
             Q_OBJECT
-  TQ_OBJECT
+  
         public:
             Proxy( KURL url );
             ~Proxy();
@@ -112,7 +112,7 @@ namespace TitleProxy
     class Server : public TQServerSocket
     {
             Q_OBJECT
-  TQ_OBJECT
+  
 
         public:
             Server( TQ_UINT16 port, TQObject* parent )
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index 72628430..0cd172a6 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -50,7 +50,7 @@ class KToggleAction;
 class Excellent : public KMainWindow, public UserInterface
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	Excellent();
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 663eaae0..acadeabd 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -34,7 +34,7 @@ class KAction;
 class HTMLExport : public TQObject, public Plugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 NOATUNPLUGIND
 public:
 	HTMLExport();
@@ -55,7 +55,7 @@ private slots:
 class Prefs : public CModule
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Prefs(TQObject *parent);
 	virtual void save();
diff --git a/noatun/modules/infrared/infrared.h b/noatun/modules/infrared/infrared.h
index cb58ff82..a8c9bd56 100644
--- a/noatun/modules/infrared/infrared.h
+++ b/noatun/modules/infrared/infrared.h
@@ -11,7 +11,7 @@ class Lirc;
 class InfraRed : public TQObject, public Plugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 NOATUNPLUGIND
 public:
 	InfraRed();
diff --git a/noatun/modules/infrared/irprefs.h b/noatun/modules/infrared/irprefs.h
index 747b80c8..3554ae01 100644
--- a/noatun/modules/infrared/irprefs.h
+++ b/noatun/modules/infrared/irprefs.h
@@ -15,7 +15,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 81bd5edc..c770cbac 100644
--- a/noatun/modules/infrared/lirc.h
+++ b/noatun/modules/infrared/lirc.h
@@ -13,7 +13,7 @@ typedef TQMap<TQString, TQStringList> Remotes;
 class Lirc : public TQObject
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	/**
 	 * Constructor
diff --git a/noatun/modules/kaiman/pref.h b/noatun/modules/kaiman/pref.h
index 11b19c8b..19895bff 100644
--- a/noatun/modules/kaiman/pref.h
+++ b/noatun/modules/kaiman/pref.h
@@ -27,7 +27,7 @@ class TQLabel;
 class KaimanPrefDlg : public CModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     public:
 	KaimanPrefDlg( TQObject *parent );
 	virtual ~KaimanPrefDlg();
diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h
index 19d44b98..0fb4fe42 100644
--- a/noatun/modules/kaiman/style.h
+++ b/noatun/modules/kaiman/style.h
@@ -32,7 +32,7 @@
 class KaimanStyleElement : public TQWidget
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleElement(TQWidget *parent, const char *name=0);
     ~KaimanStyleElement();
@@ -73,7 +73,7 @@ private:
 class KaimanStyleMasked : public KaimanStyleElement
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleMasked(TQWidget *parent, const char *name=0)
         : KaimanStyleElement( parent, name ) {};
@@ -90,7 +90,7 @@ public:
 class KaimanStyleButton : public KaimanStyleMasked
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleButton(TQWidget *parent, const char *name=0);
     ~KaimanStyleButton();
@@ -128,7 +128,7 @@ private:
 class KaimanStyleSlider : public KaimanStyleMasked
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleSlider(int min, int max, TQWidget *parent, const char *name=0);
     ~KaimanStyleSlider();
@@ -167,7 +167,7 @@ protected:
 class KaimanStyleBackground : public KaimanStyleMasked
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleBackground(TQWidget *parent, const char *name=0);
     ~KaimanStyleBackground();
@@ -187,7 +187,7 @@ private:
 class KaimanStyleValue : public KaimanStyleMasked
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleValue(int min, int max, TQWidget *parent, const char *name=0);
     ~KaimanStyleValue();
@@ -206,7 +206,7 @@ private:
 class KaimanStyleState : public KaimanStyleMasked
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleState(TQWidget *parent, const char *name=0);
     ~KaimanStyleState();
@@ -230,7 +230,7 @@ private:
 class KaimanStyleNumber : public KaimanStyleElement
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleNumber(TQWidget *parent, const char *name=0);
     ~KaimanStyleNumber();
@@ -255,7 +255,7 @@ private:
 class KaimanStyleText : public KaimanStyleElement
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleText(TQWidget *parent, const char *name=0);
     ~KaimanStyleText();
@@ -290,7 +290,7 @@ private:
 class KaimanStyleAnimation : public KaimanStyleMasked
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyleAnimation(int delay, TQWidget *parent, const char *name=0);
     ~KaimanStyleAnimation();
@@ -311,7 +311,7 @@ private:
 class KaimanStyle : public TQWidget
 {
  Q_OBJECT
-  TQ_OBJECT
+  
 public:
     KaimanStyle(TQWidget *parent, const char *name=0);
     ~KaimanStyle();
diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h
index e1e2f8c6..aac209f3 100644
--- a/noatun/modules/kaiman/userinterface.h
+++ b/noatun/modules/kaiman/userinterface.h
@@ -35,7 +35,7 @@ class Player;
 class Kaiman : public KMainWindow, public UserInterface
 {
 Q_OBJECT
-  TQ_OBJECT
+  
  public:
     Kaiman();
     virtual ~Kaiman();
diff --git a/noatun/modules/keyz/keyz.h b/noatun/modules/keyz/keyz.h
index d1955319..ad3fe550 100644
--- a/noatun/modules/keyz/keyz.h
+++ b/noatun/modules/keyz/keyz.h
@@ -7,7 +7,7 @@
 class Keyz : public TQObject, public Plugin
 {
     Q_OBJECT
-  TQ_OBJECT
+  
     NOATUNPLUGIND
 
 public:
@@ -36,7 +36,7 @@ private:
 class KeyzPrefs : public CModule
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     KeyzPrefs( TQObject *parent );
diff --git a/noatun/modules/kjofol-skin/kjbutton.h b/noatun/modules/kjofol-skin/kjbutton.h
index c0eba625..28dcf355 100644
--- a/noatun/modules/kjofol-skin/kjbutton.h
+++ b/noatun/modules/kjofol-skin/kjbutton.h
@@ -8,7 +8,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 18997c6f..2280db59 100644
--- a/noatun/modules/kjofol-skin/kjequalizer.h
+++ b/noatun/modules/kjofol-skin/kjequalizer.h
@@ -11,7 +11,7 @@ class VInterpolation;
 class KJEqualizer : public TQObject, public KJWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KJEqualizer(const TQStringList &, KJLoader *parent);
 	~KJEqualizer(void);
diff --git a/noatun/modules/kjofol-skin/kjloader.h b/noatun/modules/kjofol-skin/kjloader.h
index fa54dc5c..27af10a3 100644
--- a/noatun/modules/kjofol-skin/kjloader.h
+++ b/noatun/modules/kjofol-skin/kjloader.h
@@ -33,7 +33,7 @@ class KJPrefs;
 class KJLoader :  public TQWidget, public UserInterface, public Parser
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 NOATUNPLUGIND
 
 	friend class KJWidget;
diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h
index 89991dea..218e20cb 100644
--- a/noatun/modules/kjofol-skin/kjprefs.h
+++ b/noatun/modules/kjofol-skin/kjprefs.h
@@ -25,7 +25,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 4997df9d..3487ae0d 100644
--- a/noatun/modules/kjofol-skin/kjtextdisplay.h
+++ b/noatun/modules/kjofol-skin/kjtextdisplay.h
@@ -12,7 +12,7 @@ class KPixmap;
 class KJFilename : public TQObject, public KJWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	KJFilename(const TQStringList &, KJLoader *parent);
 	~KJFilename();
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index e1d91f7d..4b63e850 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -35,7 +35,7 @@ class Player;
 class Marquis : public KMainWindow, public SessionManagement
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 NOATUNPLUGIND
 public:
 	Marquis();
diff --git a/noatun/modules/metatag/edit.h b/noatun/modules/metatag/edit.h
index a3aa0947..801c2e53 100644
--- a/noatun/modules/metatag/edit.h
+++ b/noatun/modules/metatag/edit.h
@@ -17,7 +17,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 05dbd5b5..af5ed015 100644
--- a/noatun/modules/metatag/metatag.h
+++ b/noatun/modules/metatag/metatag.h
@@ -13,7 +13,7 @@ class KAction;
 
 class MetaTagLoader:public TQObject, public Tags, public Plugin {
   Q_OBJECT
-  TQ_OBJECT
+  
   public:
     MetaTagLoader();
     ~MetaTagLoader();
diff --git a/noatun/modules/monoscope/monoscope.h b/noatun/modules/monoscope/monoscope.h
index 59ae7500..fbb61153 100644
--- a/noatun/modules/monoscope/monoscope.h
+++ b/noatun/modules/monoscope/monoscope.h
@@ -8,7 +8,7 @@ class KToggleAction;
 class Monoscope : public TQWidget,  public MonoScope, public Plugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 NOATUNPLUGIND
 
 public:
diff --git a/noatun/modules/net/net.h b/noatun/modules/net/net.h
index 5e6c509d..68df6e20 100644
--- a/noatun/modules/net/net.h
+++ b/noatun/modules/net/net.h
@@ -10,7 +10,7 @@
 class Net : public TQServerSocket, public Plugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	Net();
diff --git a/noatun/modules/noatunui/userinterface.h b/noatun/modules/noatunui/userinterface.h
index 77bf2222..1b384be9 100644
--- a/noatun/modules/noatunui/userinterface.h
+++ b/noatun/modules/noatunui/userinterface.h
@@ -24,7 +24,7 @@ class KStatusBar;
 class MilkChocolate : public TQWidget, public UserInterface
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	MilkChocolate();
 	virtual ~MilkChocolate();
diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h
index 251471ee..f32fae69 100644
--- a/noatun/modules/simple/userinterface.h
+++ b/noatun/modules/simple/userinterface.h
@@ -28,7 +28,7 @@
 class SimpleUI : public KMainWindow, public UserInterface
 {
     Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
     SimpleUI();
diff --git a/noatun/modules/splitplaylist/find.h b/noatun/modules/splitplaylist/find.h
index 7aa07201..d44bb0e5 100644
--- a/noatun/modules/splitplaylist/find.h
+++ b/noatun/modules/splitplaylist/find.h
@@ -10,7 +10,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 13a309bf..de025ad5 100644
--- a/noatun/modules/splitplaylist/playlist.h
+++ b/noatun/modules/splitplaylist/playlist.h
@@ -28,7 +28,7 @@ class TQListViewItem;
 class SplitPlaylist : public Playlist, public Plugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class SafeListViewItem;
 friend class List;
 public:
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 7b803f99..caad3a66 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -58,7 +58,7 @@ private:
 class List : public KListView
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 friend class View;
 public:
 	List(View *parent);
@@ -106,7 +106,7 @@ class KToolBar;
 class View : public KMainWindow
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	View(SplitPlaylist *mother);
 	// load the SM playlist
diff --git a/noatun/modules/systray/cmodule.h b/noatun/modules/systray/cmodule.h
index ddf52ada..10196423 100644
--- a/noatun/modules/systray/cmodule.h
+++ b/noatun/modules/systray/cmodule.h
@@ -34,7 +34,7 @@ class YHConfigWidget;
 class YHModule : public CModule
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 	public:
 		YHModule(TQObject *_parent);
 		virtual void save();
diff --git a/noatun/modules/systray/kitsystemtray.h b/noatun/modules/systray/kitsystemtray.h
index 153d772a..d012853e 100644
--- a/noatun/modules/systray/kitsystemtray.h
+++ b/noatun/modules/systray/kitsystemtray.h
@@ -37,7 +37,7 @@ class TQPixmap;
 class KitSystemTray : public KSystemTray
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	KitSystemTray(const TQString &contextMenu, KMainWindow *parent, const char *name = 0);
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index efab29be..270bef01 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -41,7 +41,7 @@ class PassivePopup;
 class NoatunSystray : public KMainWindow, public Plugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	NoatunSystray();
 	virtual ~NoatunSystray();
diff --git a/noatun/modules/voiceprint/prefs.h b/noatun/modules/voiceprint/prefs.h
index 13977a84..16b8032f 100644
--- a/noatun/modules/voiceprint/prefs.h
+++ b/noatun/modules/voiceprint/prefs.h
@@ -9,7 +9,7 @@ class KColorButton;
 class Prefs : public CModule
 { 
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
 	Prefs(TQObject* parent);
 	virtual void save();
diff --git a/noatun/modules/voiceprint/voiceprint.h b/noatun/modules/voiceprint/voiceprint.h
index 1d02bae6..0440e8c4 100644
--- a/noatun/modules/voiceprint/voiceprint.h
+++ b/noatun/modules/voiceprint/voiceprint.h
@@ -6,7 +6,7 @@
 class VoicePrint : public TQWidget,  public MonoFFTScope, public Plugin
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 
 public:
 	VoicePrint();
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.h b/noatun/modules/winskin/guiSpectrumAnalyser.h
index 8cffa3d6..05657424 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.h
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.h
@@ -29,7 +29,7 @@ enum analyserMode {MODE_NORMAL = 0, MODE_FIRE = 1, MODE_VERTICAL_LINES = 2};
 
 class GuiSpectrumAnalyser : public WaWidget  {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
     GuiSpectrumAnalyser();
diff --git a/noatun/modules/winskin/waBalanceSlider.h b/noatun/modules/winskin/waBalanceSlider.h
index cd10aa96..7a08ca04 100644
--- a/noatun/modules/winskin/waBalanceSlider.h
+++ b/noatun/modules/winskin/waBalanceSlider.h
@@ -21,7 +21,7 @@
 
 class WaBalanceSlider : public WaWidget {
     Q_OBJECT
-    TQ_OBJECT
+    
 
   public:
      WaBalanceSlider();
diff --git a/noatun/modules/winskin/waButton.h b/noatun/modules/winskin/waButton.h
index a6e67548..69afecea 100644
--- a/noatun/modules/winskin/waButton.h
+++ b/noatun/modules/winskin/waButton.h
@@ -21,7 +21,7 @@
 
 class WaButton : public WaWidget {
   Q_OBJECT
-  TQ_OBJECT
+  
  public:
    WaButton(int mapId);
    ~WaButton();
diff --git a/noatun/modules/winskin/waClutterbar.h b/noatun/modules/winskin/waClutterbar.h
index b7560039..070d9e7e 100644
--- a/noatun/modules/winskin/waClutterbar.h
+++ b/noatun/modules/winskin/waClutterbar.h
@@ -6,7 +6,7 @@
 
 class WaClutterbar : public WaWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaClutterbar();
diff --git a/noatun/modules/winskin/waDigit.h b/noatun/modules/winskin/waDigit.h
index 905431bd..8d159e71 100644
--- a/noatun/modules/winskin/waDigit.h
+++ b/noatun/modules/winskin/waDigit.h
@@ -22,7 +22,7 @@
 
 class WaDigit : public WaWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaDigit();
diff --git a/noatun/modules/winskin/waIndicator.h b/noatun/modules/winskin/waIndicator.h
index 1c26da6b..48dcdab1 100644
--- a/noatun/modules/winskin/waIndicator.h
+++ b/noatun/modules/winskin/waIndicator.h
@@ -22,7 +22,7 @@
 
 class WaIndicator : public WaWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaIndicator(int widget_mapping, int enabled_mapping, int disabled_mapping);
diff --git a/noatun/modules/winskin/waInfo.h b/noatun/modules/winskin/waInfo.h
index 3a6dfe29..df29322a 100644
--- a/noatun/modules/winskin/waInfo.h
+++ b/noatun/modules/winskin/waInfo.h
@@ -23,7 +23,7 @@
 
 class WaInfo : public WaWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaInfo();
diff --git a/noatun/modules/winskin/waJumpSlider.h b/noatun/modules/winskin/waJumpSlider.h
index 56d37d05..dc92c388 100644
--- a/noatun/modules/winskin/waJumpSlider.h
+++ b/noatun/modules/winskin/waJumpSlider.h
@@ -20,7 +20,7 @@
 
 class WaJumpSlider : public WaWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaJumpSlider();
diff --git a/noatun/modules/winskin/waLabel.h b/noatun/modules/winskin/waLabel.h
index 7303e4a0..4bbc057c 100644
--- a/noatun/modules/winskin/waLabel.h
+++ b/noatun/modules/winskin/waLabel.h
@@ -18,7 +18,7 @@
 
 class WaLabel : public WaWidget {
     Q_OBJECT
-    TQ_OBJECT
+    
 
   public:
      WaLabel(int mapping);
diff --git a/noatun/modules/winskin/waMain.h b/noatun/modules/winskin/waMain.h
index 94ae5e83..ba8aec08 100644
--- a/noatun/modules/winskin/waMain.h
+++ b/noatun/modules/winskin/waMain.h
@@ -5,7 +5,7 @@
 
 class WaMain : WaWidget {
     Q_OBJECT
-    TQ_OBJECT
+    
 public:
     WaMain();
     ~WaMain();
diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h
index 842a17d7..bba125cd 100644
--- a/noatun/modules/winskin/waSkin.h
+++ b/noatun/modules/winskin/waSkin.h
@@ -46,7 +46,7 @@ extern WaSkin *_waskin_instance;
 
 class WaSkin : public TQWidget, public UserInterface {
   Q_OBJECT
-  TQ_OBJECT 
+   
   NOATUNPLUGIND
     WaSkinModel *waSkinModel;
     WaSkinManager *waSkinManager;
diff --git a/noatun/modules/winskin/waSkinManager.h b/noatun/modules/winskin/waSkinManager.h
index bc04d89c..a3b06c45 100644
--- a/noatun/modules/winskin/waSkinManager.h
+++ b/noatun/modules/winskin/waSkinManager.h
@@ -9,7 +9,7 @@
 
 class WaSkinManager : public TQObject, public DCOPObject {
 Q_OBJECT
-//TQ_OBJECT
+//
 K_DCOP
 
 public:
diff --git a/noatun/modules/winskin/waSkinModel.h b/noatun/modules/winskin/waSkinModel.h
index 75f485d5..45898c45 100644
--- a/noatun/modules/winskin/waSkinModel.h
+++ b/noatun/modules/winskin/waSkinModel.h
@@ -27,7 +27,7 @@ extern WaSkinModel *_waskinmodel_instance;
 
 class WaSkinModel : public TQObject {
   Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaSkinModel();
diff --git a/noatun/modules/winskin/waSlider.h b/noatun/modules/winskin/waSlider.h
index 0515a3c7..b5e50a0e 100644
--- a/noatun/modules/winskin/waSlider.h
+++ b/noatun/modules/winskin/waSlider.h
@@ -23,7 +23,7 @@
 
 class WaSlider : public WaWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaSlider(int sliderBarMapId, int sliderId, bool is_volume = false);
diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h
index 3508ddca..8bf0067e 100644
--- a/noatun/modules/winskin/waStatus.h
+++ b/noatun/modules/winskin/waStatus.h
@@ -24,7 +24,7 @@ enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED};
 
 class WaStatus : public WaWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaStatus();
diff --git a/noatun/modules/winskin/waTitleBar.h b/noatun/modules/winskin/waTitleBar.h
index ad181389..2d9e3fde 100644
--- a/noatun/modules/winskin/waTitleBar.h
+++ b/noatun/modules/winskin/waTitleBar.h
@@ -29,7 +29,7 @@
 
 class WaTitleBar : public WaIndicator {
     Q_OBJECT
-  TQ_OBJECT
+  
 
   public:
      WaTitleBar();
diff --git a/noatun/modules/winskin/waVolumeSlider.h b/noatun/modules/winskin/waVolumeSlider.h
index 0f4d6ebf..9d872c9f 100644
--- a/noatun/modules/winskin/waVolumeSlider.h
+++ b/noatun/modules/winskin/waVolumeSlider.h
@@ -20,7 +20,7 @@
 
 class WaVolumeSlider:public WaWidget {
     Q_OBJECT
-    TQ_OBJECT
+    
 
   public:
      WaVolumeSlider();
diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h
index b8b5cb3f..fa86f26b 100644
--- a/noatun/modules/winskin/waWidget.h
+++ b/noatun/modules/winskin/waWidget.h
@@ -6,7 +6,7 @@
 
 class WaWidget : public TQWidget {
     Q_OBJECT
-  TQ_OBJECT
+  
 public:
     WaWidget(int mapping);
     virtual ~WaWidget();
diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h
index a047a1f3..b25b7178 100644
--- a/noatun/modules/winskin/winSkinConfig.h
+++ b/noatun/modules/winskin/winSkinConfig.h
@@ -10,7 +10,7 @@ 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 e4164212..88d756c4 100644
--- a/noatun/modules/winskin/winSkinVis.h
+++ b/noatun/modules/winskin/winSkinVis.h
@@ -25,7 +25,7 @@
 
 class WinSkinVis : public TQObject, public Visualization {
   Q_OBJECT
-  TQ_OBJECT
+  
 
  public:
   WinSkinVis(TQObject* parent,const char* name);