diff --git a/amarok/src/analyzers/analyzerbase.h b/amarok/src/analyzers/analyzerbase.h
index 41f7d742..04f2f30d 100644
--- a/amarok/src/analyzers/analyzerbase.h
+++ b/amarok/src/analyzers/analyzerbase.h
@@ -107,14 +107,14 @@ private:
 
 
 //This mess is because tqmoc generates an entry for this class despite the #if block
-//1. the TQ_OBJECT macro must be exposed
+//1. the Q_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 tqmoc generating a metaobject for this class
 class Base3D : public Base<TQGLWidget>
 {
-Q_OBJECT
+  Q_OBJECT
   TQ_OBJECT
 #ifdef HAVE_TQGLWIDGET
 protected:
diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h
index 4fa92856..b4b8acbd 100644
--- a/amarok/src/scripts/graphequalizer/stdinreader.h
+++ b/amarok/src/scripts/graphequalizer/stdinreader.h
@@ -11,8 +11,10 @@
 
 class StdinReader : public TQObject
 {
-TQ_OBJECT    
-    public:
+    Q_OBJECT
+    TQ_OBJECT
+
+public:
     StdinReader(TQObject * tqparent = 0, const char * name = 0)
     :TQObject(tqparent,name)
     {
diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h
index 8fa85628..60c4bf6e 100644
--- a/amarok/src/threadmanager.h
+++ b/amarok/src/threadmanager.h
@@ -76,7 +76,7 @@
  */
 
 
-/// This class is because tqmoc "is really good" (no nested TQ_OBJECT classes)
+/// This class is because tqmoc "is really good" (no nested Q_OBJECT classes)
 class JobBase : public TQObject {
 	Q_OBJECT
 	TQ_OBJECT