7 files changed, 20 insertions, 20 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 * )));