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

6 files changed, 23 insertions, 23 deletions

diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index 58df521f..d2f2f8ac 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -1809,7 +1809,7 @@ TQString Catalog::dateTime() const
     {
         case Qt::LocalDate:
         {
-            dateTimeString = KGlobal::locale()->formatDateTime( dt );
+            dateTimeString = TDEGlobal::locale()->formatDateTime( dt );
             break;
         }
         case Qt::ISODate:
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index 24d469ec..d16bc9cc 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -90,7 +90,7 @@ TQString KBabel::GNUPluralForms(const TQString& lang)
     
     infile.close();
 
-    KProcess msginit;
+    TDEProcess msginit;
     
     msginit << "msginit";
     msginit 
@@ -103,7 +103,7 @@ TQString KBabel::GNUPluralForms(const TQString& lang)
 	<< "--no-translator" 
 	<< "--no-wrap" ;
     
-    msginit.start( KProcess::Block );
+    msginit.start( TDEProcess::Block );
     
     TQString res("");
     
@@ -200,7 +200,7 @@ TQString Defaults::Identity::mailingList()
 TQString Defaults::Identity::languageCode()
 {   
     // first try to get the language from KDE settings
-    KLocale *locale = KGlobal::locale();
+    KLocale *locale = TDEGlobal::locale();
     TQString lang;
     if(locale)
     {
diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp
index 11e6969f..3a191a59 100644
--- a/kbabel/common/msgfmt.cpp
+++ b/kbabel/common/msgfmt.cpp
@@ -56,12 +56,12 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
    Status stat=Ok;
    // this method does not return the right retrun values at the moment :-(
 
-   KProcess proc;
+   TDEProcess proc;
 
-   connect(&proc,TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-            this,TQT_SLOT(addToOutput(KProcess*,char *, int )));
-   connect(&proc,TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-            this,TQT_SLOT(addToOutput(KProcess*,char *, int)));
+   connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
+   connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
 
    // remove last output
    _output="";
@@ -74,7 +74,7 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu)
 	proc << "-vc";
    }
 
-   if(!proc.start(KProcess::Block,KProcess::Stderr))
+   if(!proc.start(TDEProcess::Block,TDEProcess::Stderr))
    {
       stat=NoExecutable;
    }
@@ -97,21 +97,21 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
    Status stat=Ok;
 
    // this method does not return the right return values at the moment :-(
-   KProcess proc;
+   TDEProcess proc;
    proc.setUseShell(true);
 
-   connect(&proc,TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
-            this,TQT_SLOT(addToOutput(KProcess*,char *, int )));
-   connect(&proc,TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
-            this,TQT_SLOT(addToOutput(KProcess*,char *, int)));
+   connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
+            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int )));
+   connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+            this,TQT_SLOT(addToOutput(TDEProcess*,char *, int)));
 
    // remove last output
    _output="";
 
    proc << "IFS='\n'; msgfmt --statistics -o /dev/null "
-           "$(find" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")";
+           "$(find" << TDEProcess::quote(dir) << "-name" << TDEProcess::quote(regexp) << ")";
 
-   if(!proc.start(KProcess::Block,KProcess::Stderr))
+   if(!proc.start(TDEProcess::Block,TDEProcess::Stderr))
    {
       stat=NoExecutable;
    }
@@ -131,7 +131,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o
 
 
 
-void Msgfmt::addToOutput(KProcess*,char *buffer, int buflen)
+void Msgfmt::addToOutput(TDEProcess*,char *buffer, int buflen)
 {
    TQString newString = TQString::fromLocal8Bit(buffer, buflen);
 
diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h
index 35a621ba..b5317751 100644
--- a/kbabel/common/msgfmt.h
+++ b/kbabel/common/msgfmt.h
@@ -36,7 +36,7 @@
 #include <tqobject.h>
 #include <kdemacros.h>
 
-class KProcess;
+class TDEProcess;
 class TQString;
 
 namespace KBabel
@@ -54,7 +54,7 @@ public:
    Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output);
 
 private slots:
-   void addToOutput(KProcess*,char *buffer, int buflen);
+   void addToOutput(TDEProcess*,char *buffer, int buflen);
 
 private:
     static TQString tempSaveName();
diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp
index 1d3efd77..774d1ede 100644
--- a/kbabel/common/projectsettings.cpp
+++ b/kbabel/common/projectsettings.cpp
@@ -46,7 +46,7 @@ TQString KBabel::Defaults::Spellcheck::ignoreURL()
 {
     TQString _ignoreURL;
 
-    KStandardDirs * dirs = KGlobal::dirs();
+    KStandardDirs * dirs = TDEGlobal::dirs();
     if(dirs)
     {
 	_ignoreURL = dirs->saveLocation("appdata");
@@ -113,7 +113,7 @@ TQString KBabel::Defaults::CatalogManager::ignoreURL()
 {
     TQString _ignoreURL;
 
-    KStandardDirs * dirs = KGlobal::dirs();
+    KStandardDirs * dirs = TDEGlobal::dirs();
     if(dirs)
     {
 	_ignoreURL = dirs->saveLocation("appdata");
diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp
index 4fae0e7b..18fd96f2 100644
--- a/kbabel/common/tagextractor.cpp
+++ b/kbabel/common/tagextractor.cpp
@@ -42,7 +42,7 @@ using namespace KBabel;
 
 TagExtractor::TagExtractor() : RegExpExtractor(TQStringList())
 {
-    KConfig* config = KGlobal::config();
+    KConfig* config = TDEGlobal::config();
     
     config->setGroup("Tags");