TQt conversion

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

2 files changed, 48 insertions, 48 deletions

diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index e6137cc5..96314257 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -28,7 +28,7 @@
 
 using namespace KMrml;
 
-Watcher::Watcher( const QCString& name )
+Watcher::Watcher( const TQCString& name )
     : KDEDModule( name )
 {
     m_daemons.setAutoDelete( true );
@@ -36,8 +36,8 @@ Watcher::Watcher( const QCString& name )
     // safety, for clients that die without unregistering
     KApplication::dcopClient()->setNotifications( true );
     connect( KApplication::dcopClient(),
-             SIGNAL( applicationRemoved( const QCString& )),
-             SLOT( slotAppUnregistered( const QCString& )));
+             TQT_SIGNAL( applicationRemoved( const TQCString& )),
+             TQT_SLOT( slotAppUnregistered( const TQCString& )));
 }
 
 Watcher::~Watcher()
@@ -45,9 +45,9 @@ Watcher::~Watcher()
     KApplication::dcopClient()->setNotifications( false );
 }
 
-bool Watcher::requireDaemon( const QCString& clientAppId,
-                             const QString& daemonKey,
-                             const QString& commandline,
+bool Watcher::requireDaemon( const TQCString& clientAppId,
+                             const TQString& daemonKey,
+                             const TQString& commandline,
                              uint timeout /* seconds */,
                              int restartOnFailure )
 {
@@ -84,20 +84,20 @@ bool Watcher::requireDaemon( const QCString& clientAppId,
         daemon->process->setEnvironment( "LANG", "C" );
         daemon->process->setEnvironment( "LANGUAGE", "C" );
         *daemon->process << commandline;
-        connect( daemon->process, SIGNAL( processExited( KProcess * ) ),
-                 SLOT( slotProcExited( KProcess * )));
+        connect( daemon->process, TQT_SIGNAL( processExited( KProcess * ) ),
+                 TQT_SLOT( slotProcExited( KProcess * )));
         return startDaemon( daemon );
     }
 }
 
-void Watcher::unrequireDaemon( const QCString& clientAppId,
-                               const QString& daemonKey )
+void Watcher::unrequireDaemon( const TQCString& clientAppId,
+                               const TQString& daemonKey )
 {
     unrequireDaemon( m_daemons.find( daemonKey ), clientAppId );
 }
 
 void Watcher::unrequireDaemon( DaemonData *daemon,
-                               const QCString& clientAppId )
+                               const TQCString& clientAppId )
 {
     if ( daemon )
     {
@@ -106,9 +106,9 @@ void Watcher::unrequireDaemon( DaemonData *daemon,
         {
             if ( !daemon->timer )
             {
-                daemon->timer = new QTimer();
-                connect( daemon->timer, SIGNAL( timeout() ),
-                         SLOT( slotTimeout() ));
+                daemon->timer = new TQTimer();
+                connect( daemon->timer, TQT_SIGNAL( timeout() ),
+                         TQT_SLOT( slotTimeout() ));
             }
             daemon->timer->start( daemon->timeout * 1000, true );
         }
@@ -118,10 +118,10 @@ void Watcher::unrequireDaemon( DaemonData *daemon,
                     << clientAppId << endl;
 }
 
-QStringList Watcher::runningDaemons() const
+TQStringList Watcher::runningDaemons() const
 {
-    QStringList result;
-    QDictIterator<DaemonData> it( m_daemons );
+    TQStringList result;
+    TQDictIterator<DaemonData> it( m_daemons );
     for ( ; it.current(); ++it )
         result.append( it.current()->commandline );
 
@@ -188,7 +188,7 @@ bool Watcher::startDaemon( DaemonData *daemon )
 
 void Watcher::slotTimeout()
 {
-    QTimer *timer = static_cast<QTimer*>( const_cast<QObject *>( sender() ) );
+    TQTimer *timer = static_cast<TQTimer*>( const_cast<TQObject *>( sender() ) );
     DaemonData *daemon = findDaemonFromTimer( timer );
     if ( daemon )
     {
@@ -197,7 +197,7 @@ void Watcher::slotTimeout()
             // the daemon and KProcess might get deleted by killing the
             // KProcess (through slotProcExited()), so don't dereference
             // daemon after proc->kill()
-            QString key = daemon->daemonKey;
+            TQString key = daemon->daemonKey;
 
             // noone registered during the timeout, so kill the daemon
             if ( !daemon->process->kill() )
@@ -211,7 +211,7 @@ void Watcher::slotTimeout()
 DaemonData * Watcher::findDaemonFromProcess( KProcess *proc )
 {
     DaemonData *daemon;
-    QDictIterator<DaemonData> it( m_daemons );
+    TQDictIterator<DaemonData> it( m_daemons );
     for ( ; (daemon = it.current()); ++it )
     {
         if ( daemon->process == proc )
@@ -221,10 +221,10 @@ DaemonData * Watcher::findDaemonFromProcess( KProcess *proc )
     return 0L;
 }
 
-DaemonData * Watcher::findDaemonFromTimer( QTimer *timer )
+DaemonData * Watcher::findDaemonFromTimer( TQTimer *timer )
 {
     DaemonData *daemon;
-    QDictIterator<DaemonData> it( m_daemons );
+    TQDictIterator<DaemonData> it( m_daemons );
     for ( ; (daemon = it.current()); ++it )
     {
         if ( daemon->timer == timer )
@@ -234,13 +234,13 @@ DaemonData * Watcher::findDaemonFromTimer( QTimer *timer )
     return 0L;
 }
 
-void Watcher::slotAppUnregistered( const QCString& appId )
+void Watcher::slotAppUnregistered( const TQCString& appId )
 {
     if ( m_daemons.isEmpty() )
         return;
 
     DaemonData *daemon;
-    QDictIterator<DaemonData> it( m_daemons );
+    TQDictIterator<DaemonData> it( m_daemons );
     for ( ; (daemon = it.current()); ++it )
     {
         if ( daemon->apps.find( appId ) != -1 )
@@ -270,7 +270,7 @@ void Watcher::emitFailure( DaemonData *daemon )
 }
 
 extern "C" {
-    KDE_EXPORT KDEDModule *create_daemonwatcher(const QCString & obj )
+    KDE_EXPORT KDEDModule *create_daemonwatcher(const TQCString & obj )
     {
         return new Watcher( obj );
     }
diff --git a/kmrml/kmrml/server/watcher.h b/kmrml/kmrml/server/watcher.h
index 67d9b5e1..ef7ae9eb 100644
--- a/kmrml/kmrml/server/watcher.h
+++ b/kmrml/kmrml/server/watcher.h
@@ -19,11 +19,11 @@
 #ifndef LAUNCHER_H
 #define LAUNCHER_H
 
-#include <qdict.h>
-#include <qmap.h>
-#include <qstrlist.h>
-#include <qstringlist.h>
-#include <qtimer.h>
+#include <tqdict.h>
+#include <tqmap.h>
+#include <tqstrlist.h>
+#include <tqstringlist.h>
+#include <tqtimer.h>
 
 #include <kdedmodule.h>
 #include <kprocess.h>
@@ -33,7 +33,7 @@ namespace KMrml
     class DaemonData
     {
     public:
-        DaemonData( const QString& key, const QString& cmd,
+        DaemonData( const TQString& key, const TQString& cmd,
                     uint time, int numRestarts )
             : daemonKey( key ),
               commandline( cmd ),
@@ -49,13 +49,13 @@ namespace KMrml
             delete process;
             delete timer;
         }
-        QString daemonKey;
-        QString commandline;
+        TQString daemonKey;
+        TQString commandline;
         uint timeout;
-        QStrList apps;
+        TQStrList apps;
         int restartOnFailure;
         KProcess *process;
-        QTimer *timer;
+        TQTimer *timer;
     };
 
     class Watcher : public KDEDModule
@@ -64,22 +64,22 @@ namespace KMrml
         K_DCOP
 
     public:
-        Watcher( const QCString& name = "daemonwatcher" );
+        Watcher( const TQCString& name = "daemonwatcher" );
         ~Watcher();
 
     k_dcop:
-        virtual bool requireDaemon( const QCString& clientAppId,
-                                    const QString& daemonKey,
-                                    const QString& commandline,
+        virtual bool requireDaemon( const TQCString& clientAppId,
+                                    const TQString& daemonKey,
+                                    const TQString& commandline,
                                     uint timeout = 60 /* seconds */,
                                     int numRestarts = 5 );
-        virtual void unrequireDaemon( const QCString& clientAppId,
-                                      const QString& daemonKey );
-        virtual QStringList runningDaemons() const;
+        virtual void unrequireDaemon( const TQCString& clientAppId,
+                                      const TQString& daemonKey );
+        virtual TQStringList runningDaemons() const;
 
     k_dcop_signals:
-        void daemonExited(const QString& daemonKey, pid_t pid, int exitStatus);
-        void daemonDied( const QString& daemonKey, pid_t pid );
+        void daemonExited(const TQString& daemonKey, pid_t pid, int exitStatus);
+        void daemonDied( const TQString& daemonKey, pid_t pid );
 
     protected:
         bool startDaemon( DaemonData *daemon );
@@ -88,18 +88,18 @@ namespace KMrml
         virtual void slotTimeout();
 
     private:
-        void unrequireDaemon( DaemonData *daemon, const QCString& clientAppId);
+        void unrequireDaemon( DaemonData *daemon, const TQCString& clientAppId);
         DaemonData *findDaemonFromProcess( KProcess *proc );
-        DaemonData *findDaemonFromTimer( QTimer *timer );
+        DaemonData *findDaemonFromTimer( TQTimer *timer );
 
         void emitExited( DaemonData *daemon );
         void emitFailure( DaemonData *daemon );
 
     private slots:
         void slotProcExited( KProcess *proc );
-        void slotAppUnregistered( const QCString& appId );
+        void slotAppUnregistered( const TQCString& appId );
 
-        QDict<DaemonData> m_daemons;
+        TQDict<DaemonData> m_daemons;
     };
 
 }