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

1 files changed, 8 insertions, 8 deletions

diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index d3cc3c6b6..ef76e04f6 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -82,7 +82,7 @@ static TQCString getDescrFromNum(unsigned int _num)
   if (!KDebugCache) {
     kdd.setObject(KDebugCache, new TQIntDict<KDebugEntry>( 601 ));
     // Do not call this deleter from ~TDEApplication
-    KGlobal::unregisterStaticDeleter(&kdd);
+    TDEGlobal::unregisterStaticDeleter(&kdd);
     KDebugCache->setAutoDelete(true);
   }
 
@@ -176,7 +176,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
   {
       pcd.setObject(kDebug_data, new kDebugPrivate());
       // Do not call this deleter from ~TDEApplication
-      KGlobal::unregisterStaticDeleter(&pcd);
+      TDEGlobal::unregisterStaticDeleter(&pcd);
 
       // create the dcop interface if it has not been created yet
       if (!kDebugDCOPIface)
@@ -185,25 +185,25 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
       }
   }
 
-  if (!kDebug_data->config && KGlobal::_instance )
+  if (!kDebug_data->config && TDEGlobal::_instance )
   {
       kDebug_data->config = new KConfig("kdebugrc", false, false);
       kDebug_data->config->setGroup("0");
 
       //AB: this is necessary here, otherwise all output with area 0 won't be
       //prefixed with anything, unless something with area != 0 is called before
-      if ( KGlobal::_instance )
-        kDebug_data->aAreaName = KGlobal::instance()->instanceName();
+      if ( TDEGlobal::_instance )
+        kDebug_data->aAreaName = TDEGlobal::instance()->instanceName();
   }
 
   if (kDebug_data->config && kDebug_data->oldarea != nArea) {
     kDebug_data->config->setGroup( TQString::number(static_cast<int>(nArea)) );
     kDebug_data->oldarea = nArea;
-    if ( nArea > 0 && KGlobal::_instance )
+    if ( nArea > 0 && TDEGlobal::_instance )
       kDebug_data->aAreaName = getDescrFromNum(nArea);
     if ((nArea == 0) || kDebug_data->aAreaName.isEmpty())
-      if ( KGlobal::_instance )
-        kDebug_data->aAreaName = KGlobal::instance()->instanceName();
+      if ( TDEGlobal::_instance )
+        kDebug_data->aAreaName = TDEGlobal::instance()->instanceName();
   }
 
   int nPriority = 0;