summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-05 17:12:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-05 17:12:16 +0000
commit54e817557b3e95bc4b93fd7daa26b808c021515e (patch)
treeb0c9d737413f0a972e24ac64dfceb4285630dc62
parentebc14f270efac45b80ad89b146cc76e00add4781 (diff)
downloadamarok-54e817557b3e95bc4b93fd7daa26b808c021515e.tar.gz
amarok-54e817557b3e95bc4b93fd7daa26b808c021515e.zip
Fix missing Q_OBJECT macros
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1245170 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--amarok/src/analyzers/analyzerbase.h4
-rw-r--r--amarok/src/scripts/graphequalizer/stdinreader.h6
-rw-r--r--amarok/src/threadmanager.h2
3 files changed, 7 insertions, 5 deletions
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