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

5 files changed, 15 insertions, 15 deletions

diff --git a/lib/kross/api/interpreter.h b/lib/kross/api/interpreter.h
index ebb1a09b..04630b07 100644
--- a/lib/kross/api/interpreter.h
+++ b/lib/kross/api/interpreter.h
@@ -94,7 +94,7 @@ namespace Kross { namespace Api {
             /**
              * \return the file-wildcard used to determinate by this interpreter 
              * used scriptingfiles. Those filter will be used e.g. with
-             * KGlobal::dirs()->findAllResources() as filtermask. For example
+             * TDEGlobal::dirs()->findAllResources() as filtermask. For example
              * python just defines it as "*py".
              */
             const TQString getWildcard();
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 88877f5a..05e4f9aa 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -139,7 +139,7 @@ void ScriptGUIClient::reloadInstalledScripts()
         installedcollection->clear();
 
     TQCString partname = d->guiclient->instance()->instanceName();
-    TQStringList files = KGlobal::dirs()->findAllResources("data", partname + "/scripts/*/*.rc");
+    TQStringList files = TDEGlobal::dirs()->findAllResources("data", partname + "/scripts/*/*.rc");
     //files.sort();
     for(TQStringList::iterator it = files.begin(); it != files.end(); ++it)
         loadScriptConfigFile(*it);
@@ -155,8 +155,8 @@ bool ScriptGUIClient::installScriptPackage(const TQString& scriptpackagefile)
     }
 
     TQCString partname = d->guiclient->instance()->instanceName();
-    TQString destination = KGlobal::dirs()->saveLocation("data", partname + "/scripts/", true);
-    //TQString destination = KGlobal::dirs()->saveLocation("appdata", "scripts", true);
+    TQString destination = TDEGlobal::dirs()->saveLocation("data", partname + "/scripts/", true);
+    //TQString destination = TDEGlobal::dirs()->saveLocation("appdata", "scripts", true);
     if(destination.isNull()) {
         krosswarning("ScriptGUIClient::installScriptPackage() Failed to determinate location where the scriptpackage should be installed to!");
         return false;
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index d7234332..99b2d058 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -137,18 +137,18 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con
     slotSelectionChanged(0);
     connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
 
-    btnExec->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "exec", KIcon::MainToolbar, 16 ));
+    btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "exec", KIcon::MainToolbar, 16 ));
     connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript()));
-    btnLoad->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "fileopen", KIcon::MainToolbar, 16 ));
+    btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileopen", KIcon::MainToolbar, 16 ));
     connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript()));
-    btnUnload->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 ));
+    btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 ));
     connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript()));
-    btnInstall->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "fileimport", KIcon::MainToolbar, 16 ));
+    btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", KIcon::MainToolbar, 16 ));
     connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript()));
-    btnUninstall->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 ));
+    btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileclose", KIcon::MainToolbar, 16 ));
     connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript()));
 #ifdef KROSS_SUPPORT_NEWSTUFF
-    btnNewStuff->setIconSet(KGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", KIcon::MainToolbar, 16 ));
+    btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", KIcon::MainToolbar, 16 ));
     connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript()));
 #endif
 /*
@@ -218,7 +218,7 @@ TQListViewItem* WdgScriptsManager::addItem(ScriptAction::Ptr action, TQListViewI
 
     TQPixmap pm;
     if(action->hasIcon()) {
-        KIconLoader* icons = KGlobal::iconLoader();
+        KIconLoader* icons = TDEGlobal::iconLoader();
         pm = icons->loadIconSet(action->icon(), KIcon::Small).pixmap(TQIconSet::Small, TQIconSet::Active);
     }
     else {
@@ -346,7 +346,7 @@ void WdgScriptsManager::slotResourceInstalled()
     // Delete KNewStuff's configuration entries. These entries reflect what has
     // already been installed. As we cannot yet keep them in sync after uninstalling
     // scripts, we deactivate the check marks entirely.
-    KGlobal::config()->deleteGroup("KNewStuffStatus");
+    TDEGlobal::config()->deleteGroup("KNewStuffStatus");
 }
 
 }}
diff --git a/lib/kross/python/pythoninterpreter.cpp b/lib/kross/python/pythoninterpreter.cpp
index ded5dbc9..3b956fe0 100644
--- a/lib/kross/python/pythoninterpreter.cpp
+++ b/lib/kross/python/pythoninterpreter.cpp
@@ -111,11 +111,11 @@ PythonInterpreter::PythonInterpreter(Kross::Api::InterpreterInfo* info)
 
     // Determinate additional module-paths we like to add.
     // First add the global Kross modules-path.
-    TQStringList krossdirs = KGlobal::dirs()->findDirs("data", "kross/python");
+    TQStringList krossdirs = TDEGlobal::dirs()->findDirs("data", "kross/python");
     for(TQStringList::Iterator krossit = krossdirs.begin(); krossit != krossdirs.end(); ++krossit)
         path.append(*krossit + PYPATHDELIMITER);
     // Then add the application modules-path.
-    TQStringList appdirs = KGlobal::dirs()->findDirs("appdata", "kross/python");
+    TQStringList appdirs = TDEGlobal::dirs()->findDirs("appdata", "kross/python");
     for(TQStringList::Iterator appit = appdirs.begin(); appit != appdirs.end(); ++appit)
         path.append(*appit + PYPATHDELIMITER);
 
diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp
index ec2960b0..ec0090b6 100644
--- a/lib/kross/test/testwindow.cpp
+++ b/lib/kross/test/testwindow.cpp
@@ -48,7 +48,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco
 
     m_scriptextension = new Kross::Api::ScriptGUIClient(this, this);
 
-    TQString file = KGlobal::dirs()->findResource("appdata", "testscripting.rc");
+    TQString file = TDEGlobal::dirs()->findResource("appdata", "testscripting.rc");
     if(file.isNull())
         file = TQDir(TQDir::currentDirPath()).filePath("testscripting.rc");
     else Kross::krossdebug("-------------------------222222");