diff --git a/amarok/HACKING b/amarok/HACKING
index b44a6d06..1a08e7e9 100644
--- a/amarok/HACKING
+++ b/amarok/HACKING
@@ -119,7 +119,7 @@ great too.
 
  | class QueueList : public TDEListView
  | {
- |         Q_OBJECT
+ |         TQ_OBJECT
  |
  |     public:
  |         Queuelist( QWidget *parent, const char *name = 0 );
diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h
index ea4201d6..89766275 100644
--- a/amarok/src/actionclasses.h
+++ b/amarok/src/actionclasses.h
@@ -23,7 +23,7 @@ namespace Amarok
 {
     class Menu : public PrettyPopupMenu
     {
-        Q_OBJECT
+        TQ_OBJECT
   
         public:
             static Menu *instance();
@@ -154,7 +154,7 @@ namespace Amarok
 
     class BurnMenu : public TDEPopupMenu
     {
-            Q_OBJECT
+            TQ_OBJECT
   
 
         public:
@@ -183,7 +183,7 @@ namespace Amarok
 
     class StopMenu : public TDEPopupMenu
     {
-            Q_OBJECT
+            TQ_OBJECT
   
 
         public:
diff --git a/amarok/src/amarokcore/amarokdcophandler.h b/amarok/src/amarokcore/amarokdcophandler.h
index a5f241ee..7a498af6 100644
--- a/amarok/src/amarokcore/amarokdcophandler.h
+++ b/amarok/src/amarokcore/amarokdcophandler.h
@@ -29,7 +29,7 @@ namespace Amarok
 
 class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface
 {
-      Q_OBJECT
+      TQ_OBJECT
   
 
    public:
@@ -116,7 +116,7 @@ class DcopPlayerHandler : public TQObject, virtual public AmarokPlayerInterface
 
 class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterface
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
    public:
@@ -147,7 +147,7 @@ class DcopPlaylistHandler : public TQObject, virtual public AmarokPlaylistInterf
 
 class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylistBrowserInterface
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
    public:
@@ -162,7 +162,7 @@ class DcopPlaylistBrowserHandler : public TQObject, virtual public AmarokPlaylis
 
 class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextBrowserInterface
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
    public:
@@ -178,7 +178,7 @@ class DcopContextBrowserHandler : public TQObject, virtual public AmarokContextB
 
 class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionInterface
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
    public:
@@ -212,7 +212,7 @@ class DcopCollectionHandler : public TQObject, virtual public AmarokCollectionIn
 
 class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
    public:
@@ -232,7 +232,7 @@ class DcopScriptHandler : public TQObject, virtual public AmarokScriptInterface
 
 class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterface
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
    public:
@@ -247,7 +247,7 @@ class DcopDevicesHandler : public TQObject, virtual public AmarokDevicesInterfac
 
 class DcopMediaBrowserHandler : public TQObject, virtual public AmarokMediaBrowserInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/analyzers/analyzerbase.h b/amarok/src/analyzers/analyzerbase.h
index 5fc7a938..ed0da80e 100644
--- a/amarok/src/analyzers/analyzerbase.h
+++ b/amarok/src/analyzers/analyzerbase.h
@@ -75,7 +75,7 @@ protected:
 
 class Base2D : public Base<TQWidget>
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     const TQPixmap *background() const { return &m_background; }
@@ -107,14 +107,14 @@ private:
 
 
 //This mess is because moc generates an entry for this class despite the #if block
-//1. the Q_OBJECT macro must be exposed
+//1. the TQ_OBJECT macro must be exposed
 //2. we have to define the class
 //3. we have to declare a ctor (to satisfy the inheritance)
 //4. the slot must also by visible (!)
 //TODO find out how to stop moc generating a metaobject for this class
 class Base3D : public Base<TQGLWidget>
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 #ifdef HAVE_TQGLWIDGET
 protected:
diff --git a/amarok/src/analyzers/boomanalyzer.h b/amarok/src/analyzers/boomanalyzer.h
index 2986e519..e5cbec48 100644
--- a/amarok/src/analyzers/boomanalyzer.h
+++ b/amarok/src/analyzers/boomanalyzer.h
@@ -13,7 +13,7 @@
 
 class BoomAnalyzer : public Analyzer::Base2D
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     BoomAnalyzer( TQWidget* );
diff --git a/amarok/src/app.h b/amarok/src/app.h
index 4c8ad158..1679ecea 100644
--- a/amarok/src/app.h
+++ b/amarok/src/app.h
@@ -41,7 +41,7 @@ class MediaDeviceManager;
 
 class LIBAMAROK_EXPORT App : public TDEApplication, public EngineObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         App();
diff --git a/amarok/src/browserbar.h b/amarok/src/browserbar.h
index 474b4f69..9221d8f0 100644
--- a/amarok/src/browserbar.h
+++ b/amarok/src/browserbar.h
@@ -32,7 +32,7 @@ class TQVBox;
 
 class BrowserBar : public TQWidget, public EngineObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/clicklineedit.h b/amarok/src/clicklineedit.h
index 6aff52b6..b437b2e5 100644
--- a/amarok/src/clicklineedit.h
+++ b/amarok/src/clicklineedit.h
@@ -32,7 +32,7 @@
 */
 class ClickLineEdit : public KLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
     public:
diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h
index 09d5a60d..7be826a6 100644
--- a/amarok/src/collectionbrowser.h
+++ b/amarok/src/collectionbrowser.h
@@ -58,7 +58,7 @@ namespace CollectionBrowserIds
 
 class CollectionBrowser: public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     friend class CollectionView;
 
@@ -191,7 +191,7 @@ class CollectionItem : public TDEListViewItem {
 
 class CollectionView : public TDEListView, public DropProxyTarget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     friend class CollectionBrowser;
 
@@ -380,7 +380,7 @@ class CollectionView : public TDEListView, public DropProxyTarget
 // why is signal detailsClicked() missing from KDialogBase?
 class OrganizeCollectionDialogBase : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
     OrganizeCollectionDialogBase( TQWidget *parent=0, const char *name=0, bool modal=true,
diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h
index edc39f75..42071e0c 100644
--- a/amarok/src/collectiondb.h
+++ b/amarok/src/collectiondb.h
@@ -194,7 +194,7 @@ class PostgresqlConnection : public DbConnection
 
 class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
     friend class SimilarArtistsInsertionJob;
@@ -657,7 +657,7 @@ class INotify : public JobBase
 class INotify : public ThreadManager::DependentJob
 #endif // Q_MOC_RUN
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/amarok/src/collectionscanner/collectionscanner.h b/amarok/src/collectionscanner/collectionscanner.h
index cd38b241..77c11f1e 100644
--- a/amarok/src/collectionscanner/collectionscanner.h
+++ b/amarok/src/collectionscanner/collectionscanner.h
@@ -41,7 +41,7 @@ typedef TQMap<TQString, TQString> AttributeMap;
 
 class CollectionScanner : public TDEApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/collectionscanner/collectionscannerdcophandler.h b/amarok/src/collectionscanner/collectionscannerdcophandler.h
index 57638447..1a4eb6b2 100644
--- a/amarok/src/collectionscanner/collectionscannerdcophandler.h
+++ b/amarok/src/collectionscanner/collectionscannerdcophandler.h
@@ -26,7 +26,7 @@
 
 class DcopCollectionScannerHandler : public TQObject, virtual public CollectionScannerInterface
 {
-      Q_OBJECT
+      TQ_OBJECT
   
 
    public:
diff --git a/amarok/src/columnlist.h b/amarok/src/columnlist.h
index 10604065..142a7688 100644
--- a/amarok/src/columnlist.h
+++ b/amarok/src/columnlist.h
@@ -29,7 +29,7 @@ template<class T> class TQValueList;
 
 class ColumnList: public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     ColumnList( TQWidget *parent = 0, const char *name = 0 );
@@ -56,7 +56,7 @@ private:
 
 class ColumnsDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     static void display();
diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h
index 779f9aff..5f25248a 100644
--- a/amarok/src/configdialog.h
+++ b/amarok/src/configdialog.h
@@ -33,7 +33,7 @@ class MediumPluginManager;
 
 class AmarokConfigDialog : public TDEConfigDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/contextbrowser.h b/amarok/src/contextbrowser.h
index 2f046c5c..bcbfc922 100644
--- a/amarok/src/contextbrowser.h
+++ b/amarok/src/contextbrowser.h
@@ -38,7 +38,7 @@ namespace TDEIO { class Job; class TransferJob; }
 
 class ContextBrowser : public KTabWidget, public EngineObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
         friend class CurrentTrackJob;
diff --git a/amarok/src/coverfetcher.h b/amarok/src/coverfetcher.h
index a16c9c24..23a185df 100644
--- a/amarok/src/coverfetcher.h
+++ b/amarok/src/coverfetcher.h
@@ -40,7 +40,7 @@ namespace TDEIO { class Job; }
 class CoverFetcher : public TQObject
 {
     friend class EditSearchDialog;
-    Q_OBJECT
+    TQ_OBJECT
   
 
     static const uint MAX_COVERS_CHOICE = 10;
diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h
index 413b48e5..6ae998f7 100644
--- a/amarok/src/covermanager.h
+++ b/amarok/src/covermanager.h
@@ -27,7 +27,7 @@ class PixmapViewer;
 
 class CoverManager : public TQSplitter
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         static CoverManager *s_instance;
@@ -110,7 +110,7 @@ class CoverManager : public TQSplitter
 
 class CoverView : public TDEIconView
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
@@ -153,7 +153,7 @@ class CoverViewItem : public TDEIconViewItem
 
 
 class CoverViewDialog : public TQDialog {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/cuefile.h b/amarok/src/cuefile.h
index 3b9ca605..98bcd84e 100644
--- a/amarok/src/cuefile.h
+++ b/amarok/src/cuefile.h
@@ -51,7 +51,7 @@ class CueFileItem {
 // <<Singleton>>
 class CueFile : public TQObject, public TQMap<long, CueFileItem>, public EngineObserver
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/database_refactor/collectiondb.h b/amarok/src/database_refactor/collectiondb.h
index c6bcba98..b23ebd23 100644
--- a/amarok/src/database_refactor/collectiondb.h
+++ b/amarok/src/database_refactor/collectiondb.h
@@ -43,7 +43,7 @@ class DbConnectionPool : TQPtrQueue<DbConnection>
 
 class CollectionDB : public TQObject, public EngineObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class SimilarArtistsInsertionJob;
diff --git a/amarok/src/deletedialog.h b/amarok/src/deletedialog.h
index 4636f374..3c5479f6 100644
--- a/amarok/src/deletedialog.h
+++ b/amarok/src/deletedialog.h
@@ -30,7 +30,7 @@ class TQWidgetStack;
 
 class DeleteWidget : public DeleteDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -44,7 +44,7 @@ protected slots:
 
 class DeleteDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/deviceconfiguredialog.h b/amarok/src/deviceconfiguredialog.h
index 9d02a360..16cde2be 100644
--- a/amarok/src/deviceconfiguredialog.h
+++ b/amarok/src/deviceconfiguredialog.h
@@ -28,7 +28,7 @@ class Medium;
 */
 class DeviceConfigureDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         DeviceConfigureDialog( const Medium &medium );
diff --git a/amarok/src/devicemanager.h b/amarok/src/devicemanager.h
index 10ac9f5a..a5f50546 100644
--- a/amarok/src/devicemanager.h
+++ b/amarok/src/devicemanager.h
@@ -32,7 +32,7 @@ typedef TQMap<TQString, Medium*> MediumMap;
 class DeviceManager : public TQObject
 {
 
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         DeviceManager();
diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h
index a2aec52a..1ef077c9 100644
--- a/amarok/src/directorylist.h
+++ b/amarok/src/directorylist.h
@@ -70,7 +70,7 @@ namespace Collection { //just to keep it out of the global namespace
 
 class Item : public TQObject, public TQCheckListItem
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     Item( TQListView *parent );
diff --git a/amarok/src/editfilterdialog.h b/amarok/src/editfilterdialog.h
index 6e536e75..7e949296 100644
--- a/amarok/src/editfilterdialog.h
+++ b/amarok/src/editfilterdialog.h
@@ -22,7 +22,7 @@ class KComboBox;
 
 class EditFilterDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, const TQString &text = "" );
diff --git a/amarok/src/engine/helix/helix-configdialog.h b/amarok/src/engine/helix/helix-configdialog.h
index 9ad4ef7e..ad0ce27e 100644
--- a/amarok/src/engine/helix/helix-configdialog.h
+++ b/amarok/src/engine/helix/helix-configdialog.h
@@ -27,7 +27,7 @@ class HelixEngine;
 // the Helix core
 class HelixConfigEntry : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
    HelixConfigEntry( TQWidget *parent, Amarok::PluginConfig*,
@@ -54,7 +54,7 @@ private:
 
 class HelixSoundDevice : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
    HelixSoundDevice( TQWidget *parent, Amarok::PluginConfig *config, int &row, HelixEngine *engine );
diff --git a/amarok/src/engine/helix/helix-engine.h b/amarok/src/engine/helix/helix-engine.h
index b0a00af2..8a1eab4c 100644
--- a/amarok/src/engine/helix/helix-engine.h
+++ b/amarok/src/engine/helix/helix-engine.h
@@ -21,7 +21,7 @@ struct timeval;
 
 class HelixEngine : public Engine::Base, public PlayerControl
 {
-   Q_OBJECT
+   TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/engine/kdemm/kdemmengine.h b/amarok/src/engine/kdemm/kdemmengine.h
index edda617c..e19ca3a0 100644
--- a/amarok/src/engine/kdemm/kdemmengine.h
+++ b/amarok/src/engine/kdemm/kdemmengine.h
@@ -36,7 +36,7 @@ namespace KDE { namespace Multimedia { class SimplePlayer; } }
 
 class KDEMMEngine : public Engine::Base
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/engine/mas/masengine.h b/amarok/src/engine/mas/masengine.h
index c94806ac..509342ce 100644
--- a/amarok/src/engine/mas/masengine.h
+++ b/amarok/src/engine/mas/masengine.h
@@ -38,7 +38,7 @@ class KURL;
 
 class MasEngine : public Engine::Base
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/engine/nmm/HostList.h b/amarok/src/engine/nmm/HostList.h
index f18add88..3d75d4d7 100644
--- a/amarok/src/engine/nmm/HostList.h
+++ b/amarok/src/engine/nmm/HostList.h
@@ -31,7 +31,7 @@ class HostListItem;
 
 class HostList : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/amarok/src/engine/nmm/ServerregistryPing.h b/amarok/src/engine/nmm/ServerregistryPing.h
index 312929c0..ea60f059 100644
--- a/amarok/src/engine/nmm/ServerregistryPing.h
+++ b/amarok/src/engine/nmm/ServerregistryPing.h
@@ -35,7 +35,7 @@
 class ServerregistryPing
     : public TQSocket
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/engine/nmm/nmm_configdialog.h b/amarok/src/engine/nmm/nmm_configdialog.h
index 292046de..09267c41 100644
--- a/amarok/src/engine/nmm/nmm_configdialog.h
+++ b/amarok/src/engine/nmm/nmm_configdialog.h
@@ -37,7 +37,7 @@ class NmmLocation;
 
 class NmmConfigDialog : public Amarok::PluginConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/amarok/src/engine/nmm/nmm_engine.h b/amarok/src/engine/nmm/nmm_engine.h
index 43630cb4..061f802c 100644
--- a/amarok/src/engine/nmm/nmm_engine.h
+++ b/amarok/src/engine/nmm/nmm_engine.h
@@ -44,7 +44,7 @@ using namespace NMM;
  */
 class NmmEngine : public Engine::Base
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     NmmEngine();
diff --git a/amarok/src/engine/xine/xine-config.h b/amarok/src/engine/xine/xine-config.h
index 4f4c392d..cc64b8eb 100644
--- a/amarok/src/engine/xine/xine-config.h
+++ b/amarok/src/engine/xine/xine-config.h
@@ -23,7 +23,7 @@ class KLineEdit;
 
 class XineGeneralEntry : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -63,7 +63,7 @@ void saveXineEntry(Functor& storeEntry, T val, const TQString& key, xine_t *xine
 
 class XineStrEntry : public XineGeneralEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -80,7 +80,7 @@ class XineStrEntry : public XineGeneralEntry
 
 class XineIntEntry : public XineGeneralEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -98,7 +98,7 @@ class XineIntEntry : public XineGeneralEntry
 
 class XineEnumEntry : public XineIntEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *xine, XineConfigDialog* xcf);
@@ -107,7 +107,7 @@ public:
 
 class XineConfigDialog : public Amarok::PluginConfig
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/engine/xine/xine-engine.h b/amarok/src/engine/xine/xine-engine.h
index 8b581237..95c19f34 100644
--- a/amarok/src/engine/xine/xine-engine.h
+++ b/amarok/src/engine/xine/xine-engine.h
@@ -24,7 +24,7 @@ class XineConfigDialog;
 
 class XineEngine : public Engine::Base
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class Fader;
diff --git a/amarok/src/engine/yauap/yauap-engine.h b/amarok/src/engine/yauap/yauap-engine.h
index daf08a6e..1202058f 100644
--- a/amarok/src/engine/yauap/yauap-engine.h
+++ b/amarok/src/engine/yauap/yauap-engine.h
@@ -59,7 +59,7 @@ static DBusHandlerResult signal_handler( DBusConnection *, DBusMessage *, void *
 
 class yauapEngine : public Engine::Base
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class DBusConnection;
diff --git a/amarok/src/enginebase.h b/amarok/src/enginebase.h
index 88d4c872..25614c76 100644
--- a/amarok/src/enginebase.h
+++ b/amarok/src/enginebase.h
@@ -60,7 +60,7 @@ namespace Engine
 
     class LIBAMAROK_EXPORT Base : public TQObject, public Amarok::Plugin
     {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     signals:
diff --git a/amarok/src/enginecontroller.h b/amarok/src/enginecontroller.h
index cd41112e..3349482d 100644
--- a/amarok/src/enginecontroller.h
+++ b/amarok/src/enginecontroller.h
@@ -34,7 +34,7 @@ namespace TDEIO { class Job; }
 
 class EngineController : public TQObject, public EngineSubject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/equalizerpresetmanager.h b/amarok/src/equalizerpresetmanager.h
index ebc3ef46..f4202b91 100644
--- a/amarok/src/equalizerpresetmanager.h
+++ b/amarok/src/equalizerpresetmanager.h
@@ -30,7 +30,7 @@ class TDEListView;
 
 class EqualizerPresetManager : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/equalizersetup.h b/amarok/src/equalizersetup.h
index 03ed492e..775ea1b4 100644
--- a/amarok/src/equalizersetup.h
+++ b/amarok/src/equalizersetup.h
@@ -32,7 +32,7 @@ namespace Amarok { class Slider; }
 
 class EqualizerSetup : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index fb3eea0b..4faffb30 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -50,7 +50,7 @@ class Medium;
 
 class FileBrowser : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     enum MenuId { MakePlaylist, SavePlaylist, MediaDevice, AppendToPlaylist, QueueTrack, QueueTracks, SelectAllFiles, BurnCd, MoveToCollection, CopyToCollection, OrganizeFiles, EditTags };
@@ -101,7 +101,7 @@ class TQListViewItem;
 
 class SearchPane : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/hintlineedit.h b/amarok/src/hintlineedit.h
index 5e32bd9c..c4b571d2 100644
--- a/amarok/src/hintlineedit.h
+++ b/amarok/src/hintlineedit.h
@@ -9,7 +9,7 @@ class TQWidget;
 
 class HintLineEdit : public KLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/htmlview.h b/amarok/src/htmlview.h
index 38a51e81..37b85e8b 100644
--- a/amarok/src/htmlview.h
+++ b/amarok/src/htmlview.h
@@ -15,7 +15,7 @@ class KTempFile;
 
 class HTMLView : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h
index 7db2770b..3f1097fa 100644
--- a/amarok/src/konquisidebar/universalamarok.h
+++ b/amarok/src/konquisidebar/universalamarok.h
@@ -40,7 +40,7 @@ class TQDateTime;
 
 class amarokWidget : public TQVBox
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     amarokWidget( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
@@ -57,7 +57,7 @@ signals:
 
 class UniversalAmarok : public KonqSidebarPlugin
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     UniversalAmarok(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
diff --git a/amarok/src/ktrm.h b/amarok/src/ktrm.h
index 4cb39d8d..b552d711 100644
--- a/amarok/src/ktrm.h
+++ b/amarok/src/ktrm.h
@@ -121,7 +121,7 @@ typedef TQValueList<KTRMResult> KTRMResultList;
  */
 class KTRMLookup : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h
index 8cd351e4..f3980c3b 100644
--- a/amarok/src/lastfm.h
+++ b/amarok/src/lastfm.h
@@ -40,7 +40,7 @@ namespace TDEIO { class Job; }
    DO NOT use this class for anything else, use TDEIO directly instead. */
 class AmarokHttp : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -74,7 +74,7 @@ namespace LastFm
 
     class Controller : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
@@ -110,7 +110,7 @@ namespace LastFm
 
     class WebService : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
@@ -272,7 +272,7 @@ namespace LastFm
 
     class LoginDialog : public KDialogBase
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
@@ -289,7 +289,7 @@ namespace LastFm
 
     class CustomStationDialog : public KDialogBase
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
diff --git a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
index c160cd30..a509d0bf 100644
--- a/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
+++ b/amarok/src/magnatunebrowser/magnatunealbumdownloader.h
@@ -35,7 +35,7 @@ This class encapsulates the downloading of an album once all required informatio
 */
 class MagnatuneAlbumDownloader: public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     MagnatuneAlbumDownloader();
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
index 490aea08..9184bf08 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@@ -35,7 +35,7 @@ A specialized TDEHTMLPart for displaying html info about a Magnatune artist or a
 */
 class MagnatuneArtistInfoBox : public TDEHTMLPart
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/magnatunebrowser/magnatunebrowser.h b/amarok/src/magnatunebrowser/magnatunebrowser.h
index 91c4f0d1..b5b6a90c 100644
--- a/amarok/src/magnatunebrowser/magnatunebrowser.h
+++ b/amarok/src/magnatunebrowser/magnatunebrowser.h
@@ -50,7 +50,7 @@ Implemented as a singleton
 */
 class MagnatuneBrowser : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
index 5c201f6b..f72829ac 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
@@ -33,7 +33,7 @@
 */
 class MagnatuneDownloadDialog : public MagnatuneDownloadDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
index b372b66a..36f974d8 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
@@ -25,7 +25,7 @@
 
 class MagnatunePurchaseDialog : public magnatunePurchaseDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
index c1bd858e..24031753 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
@@ -37,7 +37,7 @@ The main class responcible for handelig of purchases from Magnatune.com
 */
 class MagnatunePurchaseHandler : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     MagnatunePurchaseHandler();
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
index 613ab96f..364706b4 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
@@ -27,7 +27,7 @@
 
 class MagnatuneRedownloadDialog : public magnatuneReDownloadDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
index 926f9fed..2e42c6b2 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
@@ -34,7 +34,7 @@ This class handles the redownloading of previously purchased albums
 */
 
 class MagnatuneRedownloadHandler : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     MagnatuneRedownloadHandler(TQWidget * parent);
diff --git a/amarok/src/magnatunebrowser/magnatunexmlparser.h b/amarok/src/magnatunebrowser/magnatunexmlparser.h
index a04f905d..07cf455f 100644
--- a/amarok/src/magnatunebrowser/magnatunexmlparser.h
+++ b/amarok/src/magnatunebrowser/magnatunexmlparser.h
@@ -42,7 +42,7 @@ class MagnatuneXmlParser : public JobBase
 class MagnatuneXmlParser : public ThreadManager::Job
 #endif
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h
index 2b8a9c38..0b83e492 100644
--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@@ -124,7 +124,7 @@ class LIBAMAROK_EXPORT MediaItem : public TDEListViewItem
 
 class MediaQueue : public TDEListView, public DropProxyTarget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -171,7 +171,7 @@ class MediaQueue : public TDEListView, public DropProxyTarget
 
 class LIBAMAROK_EXPORT MediaBrowser : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class DeviceConfigureDialog;
     friend class MediaDevice;
@@ -279,7 +279,7 @@ class LIBAMAROK_EXPORT MediaBrowser : public TQVBox
 
 class MediaView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class MediaBrowser;
     friend class MediaDevice;
@@ -327,7 +327,7 @@ class MediaView : public TDEListView
 
 class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class DeviceConfigureDialog;
     friend class TransferDialog;
diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h
index e6128edb..e58cf2df 100644
--- a/amarok/src/mediadevice/daap/daapclient.h
+++ b/amarok/src/mediadevice/daap/daapclient.h
@@ -51,7 +51,7 @@ class TQTimer;
 
 class DaapClient : public MediaDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
   
    public:
         struct ServerInfo
@@ -128,7 +128,7 @@ class DaapClient : public MediaDevice
 
 class ServerItem : public TQObject, public MediaItem
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -175,7 +175,7 @@ class DaapDownloader : public JobBase
 class DaapDownloader : public ThreadManager::Job
 #endif
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     DaapDownloader( KURL::List urls );
diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
index 60e2e3b1..486409e5 100644
--- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
@@ -27,7 +27,7 @@ namespace Daap {
 */
 class ContentFetcher : public TQHttp
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/mediadevice/daap/daapreader/reader.h b/amarok/src/mediadevice/daap/daapreader/reader.h
index b674d6e7..4f22500f 100644
--- a/amarok/src/mediadevice/daap/daapreader/reader.h
+++ b/amarok/src/mediadevice/daap/daapreader/reader.h
@@ -52,7 +52,7 @@ namespace Daap
     */
     class Reader : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
diff --git a/amarok/src/mediadevice/daap/daapserver.h b/amarok/src/mediadevice/daap/daapserver.h
index dd20e4ec..ad25cba9 100644
--- a/amarok/src/mediadevice/daap/daapserver.h
+++ b/amarok/src/mediadevice/daap/daapserver.h
@@ -21,7 +21,7 @@ namespace DNSSD {
 
 class DaapServer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/mediadevice/daap/proxy.h b/amarok/src/mediadevice/daap/proxy.h
index 63a81133..bb4f552b 100644
--- a/amarok/src/mediadevice/daap/proxy.h
+++ b/amarok/src/mediadevice/daap/proxy.h
@@ -21,7 +21,7 @@ namespace Daap {
 
     class Proxy : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.h b/amarok/src/mediadevice/generic/genericmediadevice.h
index 1891626b..c7ed1305 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.h
+++ b/amarok/src/mediadevice/generic/genericmediadevice.h
@@ -40,7 +40,7 @@ typedef TQMap<GenericMediaItem*, GenericMediaFile*> MediaItemMap;
 
 class GenericMediaDevice : public MediaDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend  class GenericMediaDeviceConfigDialog;
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h
index b1c7a29c..a20fe8d6 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.h
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h
@@ -33,7 +33,7 @@ class TransferDialog;
 
 class IfpMediaDevice : public MediaDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h
index 82d6b85f..0b10b607 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.h
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h
@@ -48,7 +48,7 @@ class PodcastInfo;
 class IpodMediaDevice : public MediaDevice
 {
     friend class IpodMediaItem;
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.h b/amarok/src/mediadevice/mtp/mtpmediadevice.h
index cb7cb8ff..72e94ab1 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.h
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h
@@ -124,7 +124,7 @@ class MtpMediaItem : public MediaItem
 
 class MtpMediaDevice : public MediaDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h
index ff14d8dc..0b219986 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.h
+++ b/amarok/src/mediadevice/njb/njbmediadevice.h
@@ -84,7 +84,7 @@ class NjbMediaItem : public MediaItem
 
 class NjbMediaDevice : public MediaDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
index 9bbed0c2..785dbf0c 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
@@ -72,7 +72,7 @@ class RioKarmaMediaItem : public MediaItem
 
 class RioKarmaMediaDevice : public MediaDevice
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/mediadevicemanager.h b/amarok/src/mediadevicemanager.h
index c568b5fb..d27eceab 100644
--- a/amarok/src/mediadevicemanager.h
+++ b/amarok/src/mediadevicemanager.h
@@ -30,7 +30,7 @@ class MediaDeviceManager : public TQObject
     //static const uint APPLE = 1;
     //static const uint IFP = 2;
 
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         MediaDeviceManager();
diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h
index a367596f..1ca7d826 100644
--- a/amarok/src/mediumpluginmanager.h
+++ b/amarok/src/mediumpluginmanager.h
@@ -43,7 +43,7 @@ typedef TQMap<TQString, Medium*> DeletedMap;
 
 class MediaDeviceConfig : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -80,7 +80,7 @@ typedef TQValueList<MediaDeviceConfig *> DeviceList;
 
 class MediumPluginManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class DeviceManager;
@@ -114,7 +114,7 @@ class MediumPluginManager : public TQObject
 
 class MediumPluginManagerDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -133,7 +133,7 @@ class MediumPluginManagerDialog : public KDialogBase
 
 class ManualDeviceAdder : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/metabundlesaver.h b/amarok/src/metabundlesaver.h
index 5ef3d320..aa62fb99 100644
--- a/amarok/src/metabundlesaver.h
+++ b/amarok/src/metabundlesaver.h
@@ -26,7 +26,7 @@ namespace TagLib {
 
 class LIBAMAROK_EXPORT MetaBundleSaver : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
      MetaBundleSaver( MetaBundle *bundle );
diff --git a/amarok/src/moodbar.h b/amarok/src/moodbar.h
index 8b3d2ef5..6401b03f 100644
--- a/amarok/src/moodbar.h
+++ b/amarok/src/moodbar.h
@@ -38,7 +38,7 @@ class MetaBundle;
 
 class Moodbar : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   
 public:
@@ -116,7 +116,7 @@ class TDEProcess;
 // For internal use only (well, mostly)
 class MoodServer : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/mountpointmanager.h b/amarok/src/mountpointmanager.h
index c4d90ccd..835a9872 100644
--- a/amarok/src/mountpointmanager.h
+++ b/amarok/src/mountpointmanager.h
@@ -145,7 +145,7 @@ public:
  *	@author Maximilian Kossick <maximilian.kossick@googlemail.com>
  */
 class MountPointManager : public TQObject {
-Q_OBJECT
+TQ_OBJECT
   
 
 signals:
diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h
index 82f2926c..43ae07d0 100644
--- a/amarok/src/multitabbar.h
+++ b/amarok/src/multitabbar.h
@@ -59,7 +59,7 @@ class DropProxyTarget
 */
 class MultiTabBar: public TQWidget
 {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         enum MultiTabBarMode{Horizontal, Vertical};
@@ -173,7 +173,7 @@ class MultiTabBar: public TQWidget
 */
 class MultiTabBarButton: public TQPushButton
 {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         MultiTabBarButton( const TQPixmap& pic, const TQString&, TQPopupMenu *popup,
@@ -250,7 +250,7 @@ class MultiTabBarButton: public TQPushButton
 */
 class MultiTabBarTab: public MultiTabBarButton
 {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         MultiTabBarTab( const TQPixmap& pic, const TQString&, int id, TQWidget *parent,
diff --git a/amarok/src/multitabbar_p.h b/amarok/src/multitabbar_p.h
index f12308ff..3bb9a2b7 100644
--- a/amarok/src/multitabbar_p.h
+++ b/amarok/src/multitabbar_p.h
@@ -29,7 +29,7 @@
 
 class MultiTabBarInternal: public TQScrollView
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 public:
         MultiTabBarInternal(TQWidget *parent,MultiTabBar::MultiTabBarMode bm);
diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h
index 691b8d03..fc399e70 100644
--- a/amarok/src/mydiroperator.h
+++ b/amarok/src/mydiroperator.h
@@ -11,7 +11,7 @@ class Medium;
 
 class MyDirOperator : public KDirOperator {
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/osd.h b/amarok/src/osd.h
index 61273488..7b93d02a 100644
--- a/amarok/src/osd.h
+++ b/amarok/src/osd.h
@@ -25,7 +25,7 @@
 
 class OSDWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
@@ -109,7 +109,7 @@ class OSDWidget : public TQWidget
 
 class OSDPreviewWidget : public OSDWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -157,7 +157,7 @@ namespace Amarok
 {
     class OSD : public OSDWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/pixmapviewer.h b/amarok/src/pixmapviewer.h
index f8a99037..5ca1aee1 100644
--- a/amarok/src/pixmapviewer.h
+++ b/amarok/src/pixmapviewer.h
@@ -22,7 +22,7 @@
 #include <tqscrollview.h>
 
 class PixmapViewer : public TQScrollView {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/playerwindow.h b/amarok/src/playerwindow.h
index cc16274c..b4e8af36 100644
--- a/amarok/src/playerwindow.h
+++ b/amarok/src/playerwindow.h
@@ -60,7 +60,7 @@ protected:
 
 class IconButton : public TQButton
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
@@ -81,7 +81,7 @@ private:
 
 class PlayerWidget : public TQWidget, public EngineObserver
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h
index 0973b4dc..5f960f13 100644
--- a/amarok/src/playlist.h
+++ b/amarok/src/playlist.h
@@ -78,7 +78,7 @@ class Medium;
 
 class Playlist : private TDEListView, public EngineObserver, public Amarok::ToolTipClient
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/playlistbrowser.h b/amarok/src/playlistbrowser.h
index bcb63ef2..b9527bf9 100644
--- a/amarok/src/playlistbrowser.h
+++ b/amarok/src/playlistbrowser.h
@@ -43,7 +43,7 @@ class PlaylistTrackItem;
 
 class PlaylistBrowser : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class DynamicMode;
     friend class PlaylistBrowserView;
@@ -241,7 +241,7 @@ class PlaylistBrowser : public TQVBox
 
 class PlaylistBrowserView : public TDEListView
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     friend class PlaylistEntry;
@@ -273,7 +273,7 @@ class PlaylistBrowserView : public TDEListView
 
 class PlaylistDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         static TQString getSaveFileName( const TQString &suggestion = TQString(), bool proposeOverwriting = false );
@@ -393,7 +393,7 @@ fileDirPath( const TQString &filePath )
 
 class InfoPane : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h
index 573f6ec5..7fa43e8d 100644
--- a/amarok/src/playlistbrowseritem.h
+++ b/amarok/src/playlistbrowseritem.h
@@ -49,7 +49,7 @@ namespace TDEIO { class Job; class TransferJob; class CopyJob; } //podcast downl
 /* A base class to be able to use polymorphism and avoid tons of casts */
 class PlaylistBrowserEntry :  public TQObject, public TDEListViewItem
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after )
@@ -86,7 +86,7 @@ class PlaylistBrowserEntry :  public TQObject, public TDEListViewItem
 
 class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &title );
@@ -107,7 +107,7 @@ class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode
 
 class PlaylistCategory : public PlaylistBrowserEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQString &, bool isFolder=false );
@@ -151,7 +151,7 @@ class PlaylistCategory : public PlaylistBrowserEntry
 
 class PlaylistEntry :  public PlaylistBrowserEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class PlaylistTrackItem;
@@ -233,7 +233,7 @@ class PlaylistEntry :  public PlaylistBrowserEntry
 
 class PlaylistTrackItem : public PlaylistBrowserEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     friend class TrackItemInfo;
 
@@ -258,7 +258,7 @@ class PlaylistTrackItem : public PlaylistBrowserEntry
 /// Stored in the database
 class PodcastEpisode : public PlaylistBrowserEntry
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
@@ -346,7 +346,7 @@ class PodcastEpisode : public PlaylistBrowserEntry
 /// Stored in the database
 class PodcastChannel : public PlaylistBrowserEntry
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
@@ -451,7 +451,7 @@ class PodcastChannel : public PlaylistBrowserEntry
 
 class StreamEntry : public PlaylistBrowserEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         StreamEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &, const TQString &t );
@@ -485,7 +485,7 @@ class StreamEntry : public PlaylistBrowserEntry
 
 class LastFmEntry : public StreamEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         LastFmEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &u, const TQString &t )
@@ -518,7 +518,7 @@ class StreamEditor : public KDialogBase
 
 class SmartPlaylist : public PlaylistBrowserEntry
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &query );
@@ -589,7 +589,7 @@ class TrackItemInfo
 */
 class ShoutcastBrowser : public PlaylistCategory
 {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         ShoutcastBrowser( PlaylistCategory* parent );
@@ -619,7 +619,7 @@ class ShoutcastBrowser : public PlaylistCategory
 */
 class ShoutcastGenre : public PlaylistCategory
 {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         ShoutcastGenre( ShoutcastBrowser *browser, TQListViewItem *after, TQString genre );
diff --git a/amarok/src/playlistloader.h b/amarok/src/playlistloader.h
index 357a9526..ac59cc9c 100644
--- a/amarok/src/playlistloader.h
+++ b/amarok/src/playlistloader.h
@@ -108,7 +108,7 @@ class UrlLoader : public JobBase
 class UrlLoader : public ThreadManager::DependentJob
 #endif // Q_MOC_RUN
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -180,7 +180,7 @@ public:
  */
 class RemotePlaylistFetcher : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     const KURL m_source;
@@ -203,7 +203,7 @@ private slots:
 
 class MyXmlLoader: public MetaBundle::XmlLoader
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     MyXmlLoader() { }
diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h
index bf35a57e..1296abdd 100644
--- a/amarok/src/playlistselection.h
+++ b/amarok/src/playlistselection.h
@@ -19,7 +19,7 @@ class DynamicMode;
 //this is a widget used in newdynamic.ui
 class PlaylistSelection : public TDEListView
 {
-        Q_OBJECT
+        TQ_OBJECT
   
     public:
         PlaylistSelection(TQWidget* parent, const char* name);
diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h
index 13656fd4..92550d13 100644
--- a/amarok/src/playlistwindow.h
+++ b/amarok/src/playlistwindow.h
@@ -40,7 +40,7 @@ class TQTimer;
   */
 class PlaylistWindow : public TQWidget, public KXMLGUIClient
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
@@ -124,7 +124,7 @@ class PlaylistWindow : public TQWidget, public KXMLGUIClient
 
 class DynamicTitle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         DynamicTitle( TQWidget* parent );
@@ -142,7 +142,7 @@ class DynamicTitle : public TQWidget
 
 class DynamicBar : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         DynamicBar( TQWidget* parent );
diff --git a/amarok/src/plugin/pluginconfig.h b/amarok/src/plugin/pluginconfig.h
index b3d240b3..3869e7c8 100644
--- a/amarok/src/plugin/pluginconfig.h
+++ b/amarok/src/plugin/pluginconfig.h
@@ -18,7 +18,7 @@ namespace Amarok
 
     class LIBAMAROK_EXPORT PluginConfig : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
 
 
         signals:
diff --git a/amarok/src/podcastsettings.h b/amarok/src/podcastsettings.h
index b4a0c0cd..5beb0e3d 100644
--- a/amarok/src/podcastsettings.h
+++ b/amarok/src/podcastsettings.h
@@ -47,7 +47,7 @@ class PodcastSettings
 
 class PodcastSettingsDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/prettypopupmenu.h b/amarok/src/prettypopupmenu.h
index 3485aaea..5c2705e9 100644
--- a/amarok/src/prettypopupmenu.h
+++ b/amarok/src/prettypopupmenu.h
@@ -41,7 +41,7 @@ class TQSize;
  */
 class PrettyPopupMenu : public TDEPopupMenu
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h
index fc429cc3..e5a281ea 100644
--- a/amarok/src/queuemanager.h
+++ b/amarok/src/queuemanager.h
@@ -36,7 +36,7 @@ class QueueItem : public TDEListViewItem
 
 class QueueList : public TDEListView
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     friend class QueueManager;
@@ -68,7 +68,7 @@ class QueueList : public TDEListView
 
 class QueueManager : public KDialogBase
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/refreshimages.h b/amarok/src/refreshimages.h
index a83427ca..89fbd0a9 100644
--- a/amarok/src/refreshimages.h
+++ b/amarok/src/refreshimages.h
@@ -25,7 +25,7 @@ class JobInfo
 
 class RefreshImages : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     RefreshImages();
diff --git a/amarok/src/scancontroller.h b/amarok/src/scancontroller.h
index ae707c7b..f5fbb50c 100644
--- a/amarok/src/scancontroller.h
+++ b/amarok/src/scancontroller.h
@@ -50,7 +50,7 @@ class ScanController : public JobBase, public TQXmlDefaultHandler
 class ScanController : public ThreadManager::DependentJob, public TQXmlDefaultHandler
 #endif // Q_MOC_RUN
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
     public:
diff --git a/amarok/src/scriptmanager.h b/amarok/src/scriptmanager.h
index 948ef0cd..d3770d0e 100644
--- a/amarok/src/scriptmanager.h
+++ b/amarok/src/scriptmanager.h
@@ -55,7 +55,7 @@ class KProcIO;
 
 class ScriptManager : public KDialogBase, public EngineObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     friend class AmarokScriptNewStuff;
diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.h b/amarok/src/scripts/graphequalizer/equalizercanvasview.h
index c894dc11..0665e4cd 100644
--- a/amarok/src/scripts/graphequalizer/equalizercanvasview.h
+++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.h
@@ -42,7 +42,7 @@ private:
  */
 class EqualizerCanvasView : public TQCanvasView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     EqualizerCanvasView(TQWidget *parent, const char *name);
@@ -64,7 +64,7 @@ private:
 
 class CallAmarok : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 public:
     CallAmarok(TQObject* parent, const char *name,
diff --git a/amarok/src/scripts/graphequalizer/equalizerdialog.h b/amarok/src/scripts/graphequalizer/equalizerdialog.h
index d804e41b..585bd258 100644
--- a/amarok/src/scripts/graphequalizer/equalizerdialog.h
+++ b/amarok/src/scripts/graphequalizer/equalizerdialog.h
@@ -28,7 +28,7 @@
 */
 class EqualizerDialog : public TQDialog
 {
-Q_OBJECT
+TQ_OBJECT
   
 public:
     EqualizerDialog();
diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h
index b0d2003c..a29ead8e 100644
--- a/amarok/src/scripts/graphequalizer/stdinreader.h
+++ b/amarok/src/scripts/graphequalizer/stdinreader.h
@@ -11,7 +11,7 @@
 
 class StdinReader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/amarok/src/scrobbler.h b/amarok/src/scrobbler.h
index 5fb8e140..4a60f7ca 100644
--- a/amarok/src/scrobbler.h
+++ b/amarok/src/scrobbler.h
@@ -28,7 +28,7 @@ class Scrobbler : public TQObject, public EngineObserver
 {
     friend class MediaDevice;
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -115,7 +115,7 @@ class SubmitQueue : public TQPtrList<SubmitItem>
 
 class ScrobblerSubmitter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/sliderwidget.h b/amarok/src/sliderwidget.h
index b3d205d4..89656885 100644
--- a/amarok/src/sliderwidget.h
+++ b/amarok/src/sliderwidget.h
@@ -37,7 +37,7 @@ namespace Amarok
 {
     class Slider : public TQSlider
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
@@ -83,7 +83,7 @@ namespace Amarok
 
     class PrettySlider : public Slider
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
@@ -118,7 +118,7 @@ namespace Amarok
 
     class VolumeSlider: public Slider
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         public:
diff --git a/amarok/src/smartplaylisteditor.h b/amarok/src/smartplaylisteditor.h
index ca2d4aa4..6f6b3834 100644
--- a/amarok/src/smartplaylisteditor.h
+++ b/amarok/src/smartplaylisteditor.h
@@ -25,7 +25,7 @@ class CriteriaEditor;
 
 class SmartPlaylistEditor : public KDialogBase
 {
-Q_OBJECT
+TQ_OBJECT
   
     friend class CriteriaEditor;
 
@@ -83,7 +83,7 @@ Q_OBJECT
 
 class CriteriaEditor : public TQHBox
 {
-Q_OBJECT
+TQ_OBJECT
   
     public:
         CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, int criteriaType, TQDomElement criteria = TQDomElement() );
diff --git a/amarok/src/socketserver.h b/amarok/src/socketserver.h
index bcc173b7..3c94d4f5 100644
--- a/amarok/src/socketserver.h
+++ b/amarok/src/socketserver.h
@@ -49,7 +49,7 @@ namespace Vis
 
     class SocketNotifier : public TQSocketNotifier
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
@@ -61,7 +61,7 @@ namespace Vis
 
     class Selector : public TQListView
     {
-        Q_OBJECT
+        TQ_OBJECT
   
         Selector( TQWidget *parent=0 );
         SocketServer *m_server;
diff --git a/amarok/src/starmanager.h b/amarok/src/starmanager.h
index ebcbdaf3..257619fe 100644
--- a/amarok/src/starmanager.h
+++ b/amarok/src/starmanager.h
@@ -20,7 +20,7 @@
 class StarManager : public TQObject
 {
 
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h
index 6dc22ee9..89508661 100644
--- a/amarok/src/statistics.h
+++ b/amarok/src/statistics.h
@@ -31,7 +31,7 @@ class StatisticsDetailedItem;
 
 class Statistics : public KDialogBase
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
@@ -54,7 +54,7 @@ class Statistics : public KDialogBase
 
 class StatisticsList : public TDEListView
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
@@ -93,7 +93,7 @@ class StatisticsList : public TDEListView
 /// The listview items which are the headers for the categories
 class StatisticsItem : public TQObject, public TDEListViewItem
 {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h
index 1db568eb..d5bea33e 100644
--- a/amarok/src/statusbar/popupMessage.h
+++ b/amarok/src/statusbar/popupMessage.h
@@ -39,7 +39,7 @@ namespace KDE
      */
     class PopupMessage : public OverlayWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/statusbar/queueLabel.h b/amarok/src/statusbar/queueLabel.h
index 42bb59b9..19f21d0d 100644
--- a/amarok/src/statusbar/queueLabel.h
+++ b/amarok/src/statusbar/queueLabel.h
@@ -28,7 +28,7 @@
 
 class QueueLabel: public TQLabel //homonym, heh heh
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h
index 235c2779..be19e4b8 100644
--- a/amarok/src/statusbar/selectLabel.h
+++ b/amarok/src/statusbar/selectLabel.h
@@ -37,7 +37,7 @@
 
 class SelectLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     Amarok::SelectAction const*const m_action;
diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h
index 67723d6e..40e1826c 100644
--- a/amarok/src/statusbar/squeezedtextlabel.h
+++ b/amarok/src/statusbar/squeezedtextlabel.h
@@ -28,7 +28,7 @@ namespace KDE {
 //KSqueezedTextLabel, except it works with rich text and puts the ellipsis on the right, as it looks nicer
 //that way in our case.
 class SqueezedTextLabel : public TQLabel {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h
index eda027ce..23f0d4ae 100644
--- a/amarok/src/statusbar/statusBarBase.h
+++ b/amarok/src/statusbar/statusBarBase.h
@@ -78,7 +78,7 @@ namespace KDE
 
     class LIBAMAROK_EXPORT StatusBar : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/statusbar/statusbar.h b/amarok/src/statusbar/statusbar.h
index f7d0b143..7aec23b1 100644
--- a/amarok/src/statusbar/statusbar.h
+++ b/amarok/src/statusbar/statusbar.h
@@ -35,7 +35,7 @@ namespace Amarok
 
     class StatusBar : public KDE::StatusBar, public EngineObserver
     {
-        Q_OBJECT
+        TQ_OBJECT
   
 
         LIBAMAROK_EXPORT static StatusBar* s_instance;
diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h
index 61339cd7..a815fb05 100644
--- a/amarok/src/statusbar/toggleLabel.h
+++ b/amarok/src/statusbar/toggleLabel.h
@@ -37,7 +37,7 @@
 
 class ToggleLabel : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     TDEToggleAction const*const m_action;
diff --git a/amarok/src/tagdialog.h b/amarok/src/tagdialog.h
index 42068a39..d3ba9de1 100644
--- a/amarok/src/tagdialog.h
+++ b/amarok/src/tagdialog.h
@@ -33,7 +33,7 @@ namespace TagLib {
 
 class TagDialog : public TagDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 
     public:
diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h
index 06657535..4a79ee11 100644
--- a/amarok/src/threadmanager.h
+++ b/amarok/src/threadmanager.h
@@ -78,9 +78,9 @@
  */
 
 
-/// This class is because moc "is really good" (no nested Q_OBJECT classes)
+/// This class is because moc "is really good" (no nested TQ_OBJECT classes)
 class LIBAMAROK_EXPORT JobBase : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
 protected:   
@@ -240,7 +240,7 @@ public:
 
     class Job : public JobBase, public TQCustomEvent
     {
-//         Q_OBJECT
+//         TQ_OBJECT
 //         
         friend class ThreadManager;         //access to m_thread
         friend class ThreadManager::Thread; //access to m_aborted
@@ -384,7 +384,7 @@ public:
 
     class DependentJob : public Job
     {
-//     Q_OBJECT
+//     TQ_OBJECT
 //     
     public:
         DependentJob( TQObject *dependent, const char *name );
diff --git a/amarok/src/tooltip.h b/amarok/src/tooltip.h
index 3a79f496..0e2952d3 100644
--- a/amarok/src/tooltip.h
+++ b/amarok/src/tooltip.h
@@ -36,7 +36,7 @@ public:
 
 class ToolTip: public TQFrame, public TQToolTip
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public:
diff --git a/amarok/src/trackpickerdialog.h b/amarok/src/trackpickerdialog.h
index e5fb687a..918dd851 100644
--- a/amarok/src/trackpickerdialog.h
+++ b/amarok/src/trackpickerdialog.h
@@ -29,7 +29,7 @@ class TrackPickerDialogBase;
 
 class TrackPickerDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 signals:
diff --git a/amarok/src/tracktooltip.h b/amarok/src/tracktooltip.h
index 62543313..d5fd2707 100644
--- a/amarok/src/tracktooltip.h
+++ b/amarok/src/tracktooltip.h
@@ -25,7 +25,7 @@ class TQWidget;
 
 class TrackToolTip: public TQObject, public Amarok::ToolTipClient
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/transferdialog.h b/amarok/src/transferdialog.h
index a789d121..d265f6f5 100644
--- a/amarok/src/transferdialog.h
+++ b/amarok/src/transferdialog.h
@@ -28,7 +28,7 @@ class TransferDialog;
 */
 class LIBAMAROK_EXPORT TransferDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/amarok/src/xmlloader.h b/amarok/src/xmlloader.h
index 75bdf386..5bd11b62 100644
--- a/amarok/src/xmlloader.h
+++ b/amarok/src/xmlloader.h
@@ -49,7 +49,7 @@ typedef TQValueList< TQPair<TQString, TQString> > XmlAttributeList;
 
 class MetaBundle::XmlLoader: public TQObject, public TQXmlDefaultHandler
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         /** Posted when a MetaBundle has been loaded. */
diff --git a/amarok/src/xmlloader_p.h b/amarok/src/xmlloader_p.h
index 5c14f2fc..625f9fb1 100644
--- a/amarok/src/xmlloader_p.h
+++ b/amarok/src/xmlloader_p.h
@@ -25,7 +25,7 @@
 
 class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     TQObject *m_target;
     TQXmlInputSource *m_source;
@@ -57,7 +57,7 @@ class MetaBundle::XmlLoader::ThreadedLoader: public TQObject, public TQThread
 
 class MetaBundle::XmlLoader::SimpleLoader: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
 public: