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

3 files changed, 12 insertions, 12 deletions

diff --git a/chalk/core/kis_meta_registry.cc b/chalk/core/kis_meta_registry.cc
index c6025869..82912da5 100644
--- a/chalk/core/kis_meta_registry.cc
+++ b/chalk/core/kis_meta_registry.cc
@@ -33,20 +33,20 @@ KisMetaRegistry::KisMetaRegistry()
 {
     // Create the colorspaces and load the profiles
 
-    KGlobal::instance()->dirs()->addResourceType("kis_profiles",
+    TDEGlobal::instance()->dirs()->addResourceType("kis_profiles",
                                                      KStandardDirs::kde_default("data") + "chalk/profiles/");
                           
     // Add those things here as well, since we are not yet using KisDoc's KisFactory instance (which inits these as well)
-    KGlobal::instance()->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/");
-    KGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc");
-    KGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc/"));
-    KGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc/"));
+    TDEGlobal::instance()->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/");
+    TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc");
+    TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc/"));
+    TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc/"));
 
     TQStringList profileFilenames;
-    profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icm", true /* recursive */);
-    profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICM", true);
-    profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICC", true);
-    profileFilenames += KGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icc", true);
+    profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icm", true /* recursive */);
+    profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICM", true);
+    profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.ICC", true);
+    profileFilenames += TDEGlobal::instance()->dirs()->findAllResources("kis_profiles", "*.icc", true);
     // Set lcms to return NUll/false etc from failing calls, rather than aborting the app.
     cmsErrorAction(LCMS_ERROR_SHOW);
 
diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc
index 2f80a0ae..cb537738 100644
--- a/chalk/core/kis_thread_pool.cc
+++ b/chalk/core/kis_thread_pool.cc
@@ -29,7 +29,7 @@ KisThreadPool::KisThreadPool()
 
     KisThreadPool::m_singleton = this;
 
-    KConfig * cfg = KGlobal::config();
+    KConfig * cfg = TDEGlobal::config();
     cfg->setGroup("");
     m_maxThreads = cfg->readNumEntry("maxthreads",  10);
     m_numberOfRunningThreads = 0;
diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc
index 2fca4ec9..f734f594 100644
--- a/chalk/core/tiles/kis_tilemanager.cc
+++ b/chalk/core/tiles/kis_tilemanager.cc
@@ -64,7 +64,7 @@ KisTileManager::KisTileManager() {
     }
     m_currentInMem = 0;
 
-    KConfig * cfg = KGlobal::config();
+    KConfig * cfg = TDEGlobal::config();
     cfg->setGroup("");
     m_maxInMem = cfg->readNumEntry("maxtilesinmem",  4000);
     m_swappiness = cfg->readNumEntry("swappiness", 100);
@@ -533,7 +533,7 @@ void KisTileManager::reclaimTileToPool(TQ_UINT8* data, TQ_INT32 pixelSize) {
 }
 
 void KisTileManager::configChanged() {
-    KConfig * cfg = KGlobal::config();
+    KConfig * cfg = TDEGlobal::config();
     cfg->setGroup("");
     m_maxInMem = cfg->readNumEntry("maxtilesinmem",  4000);
     m_swappiness = cfg->readNumEntry("swappiness", 100);