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

9 files changed, 16 insertions, 16 deletions

diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp
index 3ad967b2..c4fd67ae 100644
--- a/kbabel/kbabeldict/kbabeldict.cpp
+++ b/kbabel/kbabeldict/kbabeldict.cpp
@@ -73,14 +73,14 @@ KBabelDict::~KBabelDict()
 
 void KBabelDict::saveConfig()
 {
-    KConfig *config=KGlobal::config();
+    KConfig *config=TDEGlobal::config();
     KConfigGroupSaver gs(config,"KBabelDict");
     config->writeEntry("Preferences",view->prefVisible());
 }
 
 void KBabelDict::readConfig()
 {
-    KConfig *config=KGlobal::config();
+    KConfig *config=TDEGlobal::config();
     KConfigGroupSaver gs(config,"KBabelDict");
     bool pref=config->readBoolEntry("Preferences",true);
 
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index fa483d85..4fa44389 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -335,7 +335,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
 #if 0
    // try to find installed modules by looking into directories
    // kbabeldict/modules and getting all files *.rc
-   TQStringList dirList = KGlobal::dirs()->findDirs("data"
+   TQStringList dirList = TDEGlobal::dirs()->findDirs("data"
                                     ,"kbabeldict/modules");
 
    for ( TQStringList::Iterator it = dirList.begin(); it != dirList.end()
@@ -372,7 +372,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
       rcConfig.setGroup("SearchEngine");
 
       TQStringList appList = rcConfig.readListEntry("Applications");
-      TDEInstance *inst = KGlobal::instance();
+      TDEInstance *inst = TDEGlobal::instance();
       if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName()))
       {
           continue;
@@ -407,11 +407,11 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent,  const char* name, WFlags fl )
       }
    }
    
-   kdDebug(KBABEL_SEARCH) << "Now using trader for " << KGlobal::instance()->instanceName() << endl;
+   kdDebug(KBABEL_SEARCH) << "Now using trader for " << TDEGlobal::instance()->instanceName() << endl;
 
    // try to find installed modules by KTrader
    KTrader::OfferList offers = KTrader::self()->query("KBabelDictModule",
-	    "('"+KGlobal::instance()->instanceName()+"' in [Applications])");
+	    "('"+TDEGlobal::instance()->instanceName()+"' in [Applications])");
 	    
    for(KTrader::OfferList::ConstIterator it = offers.begin(); it != offers.end(); ++it )
    {
@@ -992,7 +992,7 @@ void KBabelDictBox::showResult(TQListViewItem *item)
          {
             if(info->lastChange.isValid())
             {
-               dateLabel->setText(KGlobal::locale()->formatDate(
+               dateLabel->setText(TDEGlobal::locale()->formatDate(
                     info->lastChange.date(),true));
             }
             else
@@ -1166,7 +1166,7 @@ void KBabelDictBox::nextInfo()
 
          if(info->lastChange.isValid())
          {
-             dateLabel->setText(KGlobal::locale()->formatDate(
+             dateLabel->setText(TDEGlobal::locale()->formatDate(
                            info->lastChange.date(),true));
          }
          else
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 18bb20ac..739dd969 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -129,7 +129,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent,  const char* name, WFlags fl )
     tempLayout->addWidget(prefStack);
     tempLayout->addStretch(1);
 
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     dictBox->readSettings(config);
     dictBox->setAutoUpdateOptions(true);
            
@@ -185,7 +185,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent,  const char* name, WFlags fl )
 KBabelDictView::~KBabelDictView()
 {
     // no need to delete child widgets, TQt does it all for us
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     dictBox->saveSettings(config);
 }
 
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;