1 files changed, 23 insertions, 23 deletions

diff --git a/amarok/src/scancontroller.h b/amarok/src/scancontroller.h
index 7b46af0a..edff21dc 100644
--- a/amarok/src/scancontroller.h
+++ b/amarok/src/scancontroller.h
@@ -20,8 +20,8 @@
 #ifndef AMAROK_SCANCONTROLLER_H
 #define AMAROK_SCANCONTROLLER_H
 
-#include <qmutex.h>
-#include <qxml.h>         //baseclass
+#include <tqmutex.h>
+#include <tqxml.h>         //baseclass
 
 #include "threadmanager.h" //baseclass
 
@@ -50,25 +50,25 @@ class ScanController : public ThreadManager::DependentJob, public QXmlDefaultHan
     public:
         static const int RestartEventType = 8891;
 
-        class RestartEvent : public QCustomEvent {
+        class RestartEvent : public TQCustomEvent {
             public:
-                RestartEvent() : QCustomEvent( RestartEventType ) {}
+                RestartEvent() : TQCustomEvent( RestartEventType ) {}
         };
 
         static const int PlaylistFoundEventType = 8890;
 
-        class PlaylistFoundEvent : public QCustomEvent {
+        class PlaylistFoundEvent : public TQCustomEvent {
             public:
-                PlaylistFoundEvent( QString path )
-                    : QCustomEvent( PlaylistFoundEventType )
+                PlaylistFoundEvent( TQString path )
+                    : TQCustomEvent( PlaylistFoundEventType )
                     , m_path( path ) {}
-                QString path() { return m_path; }
+                TQString path() { return m_path; }
             private:
-                QString m_path;
+                TQString m_path;
         };
 
     public:
-        ScanController( CollectionDB* parent, bool incremental, const QStringList& folders = QStringList() );
+        ScanController( CollectionDB* parent, bool incremental, const TQStringList& folders = TQStringList() );
         ~ScanController();
         static ScanController* instance();
         
@@ -89,7 +89,7 @@ class ScanController : public ThreadManager::DependentJob, public QXmlDefaultHan
         bool requestPause();
         bool requestUnpause();
         void requestAcknowledged();
-        void slotFileMoved( const QString &src, const QString &dest );
+        void slotFileMoved( const TQString &src, const TQString &dest );
 
     private slots:
         void slotReadReady();
@@ -99,34 +99,34 @@ class ScanController : public ThreadManager::DependentJob, public QXmlDefaultHan
         virtual bool doJob();
         static void setInstance( ScanController* instance );
 
-        bool startElement( const QString&, const QString &localName, const QString&, const QXmlAttributes &attrs );
-        void customEvent( QCustomEvent* );
+        bool startElement( const TQString&, const TQString &localName, const TQString&, const TQXmlAttributes &attrs );
+        void customEvent( TQCustomEvent* );
 
         // Member variables:
         static const uint MAX_RESTARTS = 80;
         static const uint MAX_FAILURE_PERCENTAGE = 5;
 
         KProcIO* m_scanner;
-        QStringList m_folders;
-        QStringList m_foldersToRemove;
+        TQStringList m_folders;
+        TQStringList m_foldersToRemove;
         bool m_incremental;
         bool m_hasChanged;
 
-        QString m_xmlData;
-        QMutex m_dataMutex;
-        QXmlInputSource* m_source;
-        QXmlSimpleReader* m_reader;
+        TQString m_xmlData;
+        TQMutex m_dataMutex;
+        TQXmlInputSource* m_source;
+        TQXmlSimpleReader* m_reader;
 
-        QStringList m_crashedFiles;
+        TQStringList m_crashedFiles;
 
         // Every file that the collection scanner finds is marked
         // here, as well as the source of all files that the AFT code
         // detects as having been moved.  These are the files that
         // have definitely not been deleted.  The key is the absolute
         // path.
-        QMap<QString,QString> m_filesAdded;
-        QMap<QString,QString> m_filesDeleted;
-        QMutex             m_fileMapsMutex;
+        TQMap<TQString,TQString> m_filesAdded;
+        TQMap<TQString,TQString> m_filesDeleted;
+        TQMutex             m_fileMapsMutex;
 
         static ScanController* currController;