From e6aaa3624cc6179b82a9bfff1760e742a669064c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:49:56 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp    | 2 +-
 kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp  | 2 +-
 kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp  | 2 +-
 kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp | 2 +-
 kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp         | 2 +-
 kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kbabel/kbabeldict/modules')

diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index 76b3bdc9..1a0ba180 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -1158,7 +1158,7 @@ KDBSearchEngine::readSettings (KConfigBase * config)
     lang = config->readEntry ("Language", defaultLang);
 
     TQString defaultDir;
-    KStandardDirs *dirs = KGlobal::dirs ();
+    KStandardDirs *dirs = TDEGlobal::dirs ();
     if (dirs)
       {
 	  defaultDir = dirs->saveLocation ("data");
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index 93b7a0f6..41ae81f2 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -85,7 +85,7 @@ dbpw->ignoreLE->setText("&.:");
 dbpw->autoAddCB_2->setChecked(true);
 
 TQString defaultDir;
- KStandardDirs * dirs = KGlobal::dirs();
+ KStandardDirs * dirs = TDEGlobal::dirs();
  if(dirs)
  {
      defaultDir = dirs->saveLocation("data");
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index 9620bf63..04c0ffde 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -322,7 +322,7 @@ void KDBSearchEngine2::readSettings(KConfigBase *config)
 {
     
     /*TQString defaultDir;
- KStandardDirs * dirs = KGlobal::dirs();
+ KStandardDirs * dirs = TDEGlobal::dirs();
  if(dirs)
  {
      defaultDir = dirs->saveLocation("data");
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index 8bfd2d47..d8489400 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -53,7 +53,7 @@ emit restoreNow();
 void KDB2PreferencesWidget::standard()
 {
 TQString defaultDir;
- KStandardDirs * dirs = KGlobal::dirs();
+ KStandardDirs * dirs = TDEGlobal::dirs();
  if(dirs)
  {
      defaultDir = dirs->saveLocation("data");
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 95557332..078d853a 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -74,7 +74,7 @@ PoCompendium::PoCompendium(TQObject *parent, const char *name)
     initialized=false;
     loading=false;
 
-    langCode = KGlobal::locale()->language();
+    langCode = TDEGlobal::locale()->language();
 
     caseSensitive = false;
     ignoreFuzzy=true;
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 37c3f4bf..7f2bc8b6 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -69,7 +69,7 @@ TmxCompendium::TmxCompendium(TQObject *parent, const char *name)
     initialized=false;
     loading=false;
 
-    langCode = KGlobal::locale()->language();
+    langCode = TDEGlobal::locale()->language();
 
     caseSensitive = false;
     wholeWords=true;
-- 
cgit v1.2.1