Finish TQt4 porting of Amarok

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1228394 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 3 deletions

diff --git a/amarok/src/scancontroller.h b/amarok/src/scancontroller.h
index edff21dc..780b65c6 100644
--- a/amarok/src/scancontroller.h
+++ b/amarok/src/scancontroller.h
@@ -42,10 +42,16 @@ class KProcIO;
  * driven SAX2 parser is used, which can process the entities as they arrive, without
  * the need for a DOM document structure.
  */
-
-class ScanController : public ThreadManager::DependentJob, public QXmlDefaultHandler
+#ifdef Q_MOC_RUN
+// MOC_SKIP_BEGIN
+class ScanController : public JobBase, public TQXmlDefaultHandler
+// MOC_SKIP_END
+#else // Q_MOC_RUN
+class ScanController : public ThreadManager::DependentJob, public TQXmlDefaultHandler
+#endif // Q_MOC_RUN
 {
     Q_OBJECT
+    TQ_OBJECT
 
     public:
         static const int RestartEventType = 8891;
@@ -68,7 +74,7 @@ class ScanController : public ThreadManager::DependentJob, public QXmlDefaultHan
         };
 
     public:
-        ScanController( CollectionDB* parent, bool incremental, const TQStringList& folders = TQStringList() );
+        ScanController( CollectionDB* tqparent, bool incremental, const TQStringList& folders = TQStringList() );
         ~ScanController();
         static ScanController* instance();