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

3 files changed, 10 insertions, 10 deletions

diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 1346722..bb35713 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -256,8 +256,8 @@ TQString DictionaryCreationWizard::language() {
       return mergeWidget->language();
    }
    else if (creationSource->emptyButton->isChecked()) {
-      if (KGlobal::locale())
-         return KGlobal::locale()->language();
+      if (TDEGlobal::locale())
+         return TDEGlobal::locale()->language();
       else
          return KLocale::defaultLanguage();
    }
diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
index ddc0c8f..0698b43 100644
--- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp
+++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp
@@ -30,7 +30,7 @@
 #include "klanguagebutton.h"
 
 TQString languageName (TQString languageCode) {
-   TQString filename = KGlobal::dirs()->findResource("locale",
+   TQString filename = TDEGlobal::dirs()->findResource("locale",
 			languageCode + TQString::fromLatin1("/entry.desktop"));
       
    KSimpleConfig entry(filename);
@@ -41,7 +41,7 @@ TQString languageName (TQString languageCode) {
 void loadLanguageList(KLanguageButton *combo)
 // This function was taken from tdebase/kcontrol/tdm/tdm-appear.cpp
 {
-  TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
+  TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale",
 			TQString::fromLatin1("*/entry.desktop"));
   langlist.sort();
   for ( TQStringList::ConstIterator it = langlist.begin();
@@ -57,8 +57,8 @@ void loadLanguageList(KLanguageButton *combo)
     combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString());
   }
   
-  if (KGlobal::locale())
-     combo->setCurrentItem (KGlobal::locale()->language());
+  if (TDEGlobal::locale())
+     combo->setCurrentItem (TDEGlobal::locale()->language());
   else
      combo->setCurrentItem (KLocale::defaultLanguage());
 }
diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp
index 7e54fe4..b5e34d6 100644
--- a/kmouth/wordcompletion/wordcompletionwidget.cpp
+++ b/kmouth/wordcompletion/wordcompletionwidget.cpp
@@ -70,7 +70,7 @@ public:
    }
 
    void setLanguage (TQString languageCode) {
-      TQString filename = KGlobal::dirs()->findResource("locale",
+      TQString filename = TDEGlobal::dirs()->findResource("locale",
 			languageCode + TQString::fromLatin1("/entry.desktop"));
 
       KSimpleConfig entry(filename);
@@ -141,7 +141,7 @@ void WordCompletionWidget::load() {
 
    // Clean up disc space
    for (TQStringList::Iterator it = newDictionaryFiles.begin(); it != newDictionaryFiles.end(); ++it) {
-      TQString filename = KGlobal::dirs()->findResource ("appdata", *it);
+      TQString filename = TDEGlobal::dirs()->findResource ("appdata", *it);
       if (!filename.isEmpty() && !filename.isNull())
          TQFile::remove (filename);
    }
@@ -171,7 +171,7 @@ void WordCompletionWidget::save() {
 
    // Clean up disc space
    for (TQStringList::Iterator it = removedDictionaryFiles.begin(); it != removedDictionaryFiles.end(); ++it) {
-      TQString filename = KGlobal::dirs()->findResource ("appdata", *it);
+      TQString filename = TDEGlobal::dirs()->findResource ("appdata", *it);
       if (!filename.isEmpty() && !filename.isNull())
          TQFile::remove (filename);
    }
@@ -257,7 +257,7 @@ void WordCompletionWidget::exportDictionary() {
          }
       }
       KURL src;
-      src.setPath( KGlobal::dirs()->findResource ("appdata", item->filename()) );
+      src.setPath( TDEGlobal::dirs()->findResource ("appdata", item->filename()) );
       KIO::NetAccess::copy (src, url, this);
    }
 }