Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

13 files changed, 39 insertions, 39 deletions

diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp
index 8c75bf9e..be2fbc29 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.cpp
+++ b/kmrml/kmrml/kcontrol/indexcleaner.cpp
@@ -8,7 +8,7 @@
 #if TDE_VERSION < 306
   #define QUOTE( x ) x
 #else
-  #define QUOTE( x ) KProcess::quote( x )
+  #define QUOTE( x ) TDEProcess::quote( x )
 #endif
 
 using namespace KMrmlConfig;
@@ -39,7 +39,7 @@ void IndexCleaner::start()
     startNext();
 }
 
-void IndexCleaner::slotExited( KProcess *proc )
+void IndexCleaner::slotExited( TDEProcess *proc )
 {
     emit advance( m_stepSize );
 
@@ -63,11 +63,11 @@ void IndexCleaner::startNext()
 #if TDE_VERSION < 306
     m_process = new KShellProcess();
 #else
-    m_process = new KProcess();
+    m_process = new TDEProcess();
     m_process->setUseShell( true );
 #endif
-    connect( m_process, TQT_SIGNAL( processExited( KProcess * )),
-             TQT_SLOT( slotExited( KProcess * ) ));
+    connect( m_process, TQT_SIGNAL( processExited( TDEProcess * )),
+             TQT_SLOT( slotExited( TDEProcess * ) ));
 
     TQString cmd = m_config->removeCollectionCommandLine();
 
diff --git a/kmrml/kmrml/kcontrol/indexcleaner.h b/kmrml/kmrml/kcontrol/indexcleaner.h
index 0db17887..05396870 100644
--- a/kmrml/kmrml/kcontrol/indexcleaner.h
+++ b/kmrml/kmrml/kcontrol/indexcleaner.h
@@ -11,7 +11,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-class KProcess;
+class TDEProcess;
 
 namespace KMrml
 {
@@ -37,7 +37,7 @@ namespace KMrmlConfig
         void finished();
 
     private slots:
-        void slotExited( KProcess * );
+        void slotExited( TDEProcess * );
 
     private:
         int m_stepSize;
@@ -45,7 +45,7 @@ namespace KMrmlConfig
 
         TQStringList m_dirs;
         const KMrml::Config *m_config;
-        KProcess *m_process;
+        TDEProcess *m_process;
     };
 
 }
diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp
index 44535c44..2555ce6f 100644
--- a/kmrml/kmrml/kcontrol/indexer.cpp
+++ b/kmrml/kmrml/kcontrol/indexer.cpp
@@ -30,7 +30,7 @@
 #if TDE_VERSION < 306
   #define QUOTE( x ) x
 #else
-  #define QUOTE( x ) KProcess::quote( x )
+  #define QUOTE( x ) TDEProcess::quote( x )
 #endif
 
 using namespace KMrmlConfig;
@@ -46,8 +46,8 @@ Indexer::Indexer( const KMrml::Config* config,
     m_process->setUseShell( true );
 #endif
     m_process->setEnvironment( "LC_ALL", "C" );
-    connect( m_process, TQT_SIGNAL( processExited( KProcess * )),
-             TQT_SLOT( processFinished( KProcess * )));
+    connect( m_process, TQT_SIGNAL( processExited( TDEProcess * )),
+             TQT_SLOT( processFinished( TDEProcess * )));
     connect( m_process, TQT_SIGNAL( readReady( KProcIO * )),
              TQT_SLOT( slotCanRead( KProcIO * )) );
 }
@@ -67,7 +67,7 @@ void Indexer::startIndexing( const TQStringList& dirs )
     processNext();
 }
 
-void Indexer::processFinished( KProcess *proc )
+void Indexer::processFinished( TDEProcess *proc )
 {
     // still more directories to index?
     if ( !m_dirs.isEmpty() )
@@ -118,9 +118,9 @@ void Indexer::processNext()
 
 void Indexer::slotCanRead( KProcIO *proc )
 {
-    static const TQString& sprogress = KGlobal::staticQString("PROGRESS: ");
+    static const TQString& sprogress = TDEGlobal::staticQString("PROGRESS: ");
     static const TQString& r1 = /* PROGRESS: 1 of 6 done (15%) */
-        KGlobal::staticQString( "(\\d+) of (\\d+) done \\((\\d+)%\\)" );
+        TDEGlobal::staticQString( "(\\d+) of (\\d+) done \\((\\d+)%\\)" );
 
     TQString line;
     int bytes = -1;
diff --git a/kmrml/kmrml/kcontrol/indexer.h b/kmrml/kmrml/kcontrol/indexer.h
index 1f0f6dbe..72755081 100644
--- a/kmrml/kmrml/kcontrol/indexer.h
+++ b/kmrml/kmrml/kcontrol/indexer.h
@@ -23,7 +23,7 @@
 
 #include <kmrml_config.h>
 
-class KProcess;
+class TDEProcess;
 class KProcIO;
 
 namespace KMrmlConfig
@@ -48,7 +48,7 @@ namespace KMrmlConfig
 
     private slots:
         void slotCanRead( KProcIO * );
-        void processFinished( KProcess * );
+        void processFinished( TDEProcess * );
 
     private:
         void processNext();
diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp
index 1b86867b..9571a88f 100644
--- a/kmrml/kmrml/kcontrol/indextest.cpp
+++ b/kmrml/kmrml/kcontrol/indextest.cpp
@@ -10,7 +10,7 @@ using namespace KMrmlConfig;
 
 IndexTest::IndexTest()
 {
-    KMrml::Config *config = new KMrml::Config( KGlobal::config() );
+    KMrml::Config *config = new KMrml::Config( TDEGlobal::config() );
     Indexer *indexer = new Indexer( *config, this );
     connect( indexer, TQT_SIGNAL( finished( bool )), TQT_SLOT( slotFinished( bool )));
     connect( indexer, TQT_SIGNAL( progress( int, const TQString& )),
diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
index 294d7581..2a79cd5d 100644
--- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp
+++ b/kmrml/kmrml/kcontrol/kcmkmrml.cpp
@@ -75,8 +75,8 @@ KCMKMrml::~KCMKMrml()
 
 void KCMKMrml::checkGiftInstallation()
 {
-    TQString giftExe = KGlobal::dirs()->findExe( "gift" );
-    TQString giftAddCollectionExe = KGlobal::dirs()->findExe( "gift-add-collection.pl" );
+    TQString giftExe = TDEGlobal::dirs()->findExe( "gift" );
+    TQString giftAddCollectionExe = TDEGlobal::dirs()->findExe( "gift-add-collection.pl" );
 
     if ( giftExe.isEmpty() || giftAddCollectionExe.isEmpty() )
     {
diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp
index ca491ead..b861cda4 100644
--- a/kmrml/kmrml/kcontrol/mainpage.cpp
+++ b/kmrml/kmrml/kcontrol/mainpage.cpp
@@ -73,7 +73,7 @@ MainPage::MainPage( TQWidget *parent, const char *name )
 #if TDE_VERSION >= 306
     KURLRequester *requester = new KURLRequester( this, "dir requester" );
     requester->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
-    requester->setURL( KGlobalSettings::documentPath() );
+    requester->setURL( TDEGlobalSettings::documentPath() );
     connect( requester, TQT_SIGNAL( openFileDialog( KURLRequester * )),
              TQT_SLOT( slotRequesterClicked( KURLRequester * )));
 
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 94aafa4a..63bc5e8a 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -32,7 +32,7 @@
 #if TDE_VERSION < 307
   #define QUOTE( x ) x
 #else
-  #define QUOTE( x ) KProcess::quote( x )
+  #define QUOTE( x ) TDEProcess::quote( x )
 #endif
 
 using namespace KMrml;
@@ -251,7 +251,7 @@ TQString Config::mrmldCommandline() const
 
 TQString Config::mrmldDataDir()
 {
-    TQString dir = KGlobal::dirs()->saveLocation( "data",
+    TQString dir = TDEGlobal::dirs()->saveLocation( "data",
                                                  "kmrml/mrmld-data/" );
     if ( dir.isEmpty() ) // fallback
         dir = TQDir::homeDirPath() + "/";
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index ab4cfcfc..5fc30e8c 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -40,7 +40,7 @@ extern "C" {
     {
         KLocale::setMainCatalogue("tdelibs");
         TDEInstance instance( "kio_mrml" );
-        KGlobal::locale()->insertCatalogue( "kmrml" );
+        TDEGlobal::locale()->insertCatalogue( "kmrml" );
 
         kdDebug() << "Starting MRML " << getpid() << endl;
 
@@ -62,7 +62,7 @@ const int Mrml::bufsize = 8192;
 
 Mrml::Mrml( const TQCString& pool_socket, const TQCString& app_socket )
     : TCPSlaveBase( 12789, "mrml", pool_socket, app_socket ),
-      m_config( KGlobal::config() )
+      m_config( TDEGlobal::config() )
 {
     MrmlShared::ref();
 }
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index 80ac57c0..c418ae67 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -85,7 +85,7 @@ TDEInstance * PartFactory::instance()
 {
     if ( !s_instance ) {
         s_instance = new TDEInstance( "kmrml" );
-        KGlobal::locale()->insertCatalogue( "kmrml" );
+        TDEGlobal::locale()->insertCatalogue( "kmrml" );
     }
     return s_instance;
 }
diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp
index 9555d9a1..6b7ed49c 100644
--- a/kmrml/kmrml/mrml_view.cpp
+++ b/kmrml/kmrml/mrml_view.cpp
@@ -405,7 +405,7 @@ void MrmlViewItem::mouseMoveEvent( TQMouseEvent *e )
 
     if ( (e->state() & Qt::LeftButton) && !pressedPos.isNull() ) {
         TQPoint dist = e->pos() - pressedPos;
-        if ( dist.manhattanLength() > KGlobalSettings::dndEventDelay() ) {
+        if ( dist.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
             // start drag here
             KURL::List urls;
             // ### support multiple files?
@@ -421,7 +421,7 @@ void MrmlViewItem::mouseReleaseEvent( TQMouseEvent *e )
 {
     if ( hitsPixmap( e->pos() )) {
         TQPoint dist = e->pos() - pressedPos;
-        if ( dist.manhattanLength() < KGlobalSettings::dndEventDelay() ) {
+        if ( dist.manhattanLength() < TDEGlobalSettings::dndEventDelay() ) {
             emit view()->activated( m_url, e->button() );
         }
     }
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index fe393933..1d7f464a 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -75,7 +75,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
         daemon->apps.append( clientAppId );
 
 #if TDE_VERSION >= 306
-        daemon->process = new KProcess();
+        daemon->process = new TDEProcess();
         daemon->process->setUseShell( true );
 #else
         daemon->process = new KShellProcess();
@@ -84,8 +84,8 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
         daemon->process->setEnvironment( "LANG", "C" );
         daemon->process->setEnvironment( "LANGUAGE", "C" );
         *daemon->process << commandline;
-        connect( daemon->process, TQT_SIGNAL( processExited( KProcess * ) ),
-                 TQT_SLOT( slotProcExited( KProcess * )));
+        connect( daemon->process, TQT_SIGNAL( processExited( TDEProcess * ) ),
+                 TQT_SLOT( slotProcExited( TDEProcess * )));
         return startDaemon( daemon );
     }
 }
@@ -128,7 +128,7 @@ TQStringList Watcher::runningDaemons() const
     return result;
 }
 
-void Watcher::slotProcExited( KProcess *proc )
+void Watcher::slotProcExited( TDEProcess *proc )
 {
     DaemonData *daemon = findDaemonFromProcess( proc );
 
@@ -166,7 +166,7 @@ void Watcher::slotProcExited( KProcess *proc )
 
 bool Watcher::startDaemon( DaemonData *daemon )
 {
-    if ( daemon->process->start( KProcess::NotifyOnExit ) )
+    if ( daemon->process->start( TDEProcess::NotifyOnExit ) )
         return true;
 
     else
@@ -194,8 +194,8 @@ void Watcher::slotTimeout()
     {
         if ( daemon->apps.isEmpty() )
         {
-            // the daemon and KProcess might get deleted by killing the
-            // KProcess (through slotProcExited()), so don't dereference
+            // the daemon and TDEProcess might get deleted by killing the
+            // TDEProcess (through slotProcExited()), so don't dereference
             // daemon after proc->kill()
             TQString key = daemon->daemonKey;
 
@@ -208,7 +208,7 @@ void Watcher::slotTimeout()
     }
 }
 
-DaemonData * Watcher::findDaemonFromProcess( KProcess *proc )
+DaemonData * Watcher::findDaemonFromProcess( TDEProcess *proc )
 {
     DaemonData *daemon;
     TQDictIterator<DaemonData> it( m_daemons );
@@ -265,7 +265,7 @@ void Watcher::emitFailure( DaemonData *daemon )
     if ( daemon )
     {
         daemonDied( daemon->daemonKey, daemon->process->pid() );
-        m_daemons.remove( daemon->daemonKey ); // deletes daemon + KProcess
+        m_daemons.remove( daemon->daemonKey ); // deletes daemon + TDEProcess
     }
 }
 
diff --git a/kmrml/kmrml/server/watcher.h b/kmrml/kmrml/server/watcher.h
index 00338480..e9cc0656 100644
--- a/kmrml/kmrml/server/watcher.h
+++ b/kmrml/kmrml/server/watcher.h
@@ -54,7 +54,7 @@ namespace KMrml
         uint timeout;
         TQStrList apps;
         int restartOnFailure;
-        KProcess *process;
+        TDEProcess *process;
         TQTimer *timer;
     };
 
@@ -90,14 +90,14 @@ namespace KMrml
 
     private:
         void unrequireDaemon( DaemonData *daemon, const TQCString& clientAppId);
-        DaemonData *findDaemonFromProcess( KProcess *proc );
+        DaemonData *findDaemonFromProcess( TDEProcess *proc );
         DaemonData *findDaemonFromTimer( TQTimer *timer );
 
         void emitExited( DaemonData *daemon );
         void emitFailure( DaemonData *daemon );
 
     private slots:
-        void slotProcExited( KProcess *proc );
+        void slotProcExited( TDEProcess *proc );
         void slotAppUnregistered( const TQCString& appId );
 
         TQDict<DaemonData> m_daemons;