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

---
 kcontrol/colors/colorscm.cpp     | 16 ++++++++--------
 kcontrol/colors/widgetcanvas.cpp |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kcontrol/colors')

diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 041be096d..8bf7607ce 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -308,7 +308,7 @@ void KColorScheme::load()
 }
 void KColorScheme::load( bool useDefaults )
 {
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     config->setReadDefaults(  useDefaults );
     config->setGroup("KDE");
     sCurrentScheme = config->readEntry("colorScheme");
@@ -335,7 +335,7 @@ void KColorScheme::load( bool useDefaults )
 
 void KColorScheme::save()
 {
-    KConfig *cfg = KGlobal::config();
+    KConfig *cfg = TDEGlobal::config();
     cfg->setGroup( "General" );
     cfg->writeEntry("background", cs->back, true, true);
     cfg->writeEntry("selectBackground", cs->select, true, true);
@@ -560,7 +560,7 @@ void KColorScheme::slotAdd()
     }
     else
     {
-       sFile = KGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
+       sFile = TDEGlobal::dirs()->saveLocation("data", "kdisplay/color-schemes/") + sFile + ".kcsrc";
        KSimpleConfig *config = new KSimpleConfig(sFile);
        config->setGroup( "Color Scheme");
        config->writeEntry("Name", sName);
@@ -676,11 +676,11 @@ void KColorScheme::slotSelectColor(const TQColor &col)
     // of course
     if ( selection == CSM_Standard_background &&
          color(CSM_Alternate_background) ==
-         KGlobalSettings::calculateAlternateBackgroundColor(
+         TDEGlobalSettings::calculateAlternateBackgroundColor(
              color(CSM_Standard_background) ) )
     {
         color(CSM_Alternate_background) =
-            KGlobalSettings::calculateAlternateBackgroundColor( col );
+            TDEGlobalSettings::calculateAlternateBackgroundColor( col );
     }
 
     color(selection) = col;
@@ -791,7 +791,7 @@ void KColorScheme::readScheme( int index )
 
     if (index == 0) {
       // Current scheme
-      config = KGlobal::config();
+      config = TDEGlobal::config();
       config->setGroup("General");
     } else {
       // Open scheme file
@@ -818,7 +818,7 @@ void KColorScheme::readScheme( int index )
     cs->buttonTxt = config->readColorEntry( "buttonForeground", &black );
     cs->link = config->readColorEntry( "linkColor", &link );
     cs->visitedLink = config->readColorEntry( "visitedLinkColor", &visitedLink );
-    TQColor alternate = KGlobalSettings::calculateAlternateBackgroundColor(cs->window);
+    TQColor alternate = TDEGlobalSettings::calculateAlternateBackgroundColor(cs->window);
     cs->alternateBackground = config->readColorEntry( "alternateBackground", &alternate );
 
     if (index == 0)
@@ -860,7 +860,7 @@ void KColorScheme::readSchemeNames()
     nSysSchemes = 2;
 
     // Global + local schemes
-    TQStringList list = KGlobal::dirs()->findAllResources("data",
+    TQStringList list = TDEGlobal::dirs()->findAllResources("data",
             "kdisplay/color-schemes/*.kcsrc", false, true);
 
     // And add them
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 623fd67b8..db39d21be 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -282,14 +282,14 @@ void WidgetCanvas::drawSampleWidgets()
 
     // Keep in sync with kglobalsettings.
 
-    TQFont windowFontGuess(KGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
+    TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
     windowFontGuess.setPixelSize(12);
 
     c->setGroup("WM");
     TQFont windowFont = c->readFontEntry("activeFont", &windowFontGuess);
 
     c->setGroup("General");
-    TQFont defaultMenuFont = KGlobalSettings::menuFont();
+    TQFont defaultMenuFont = TDEGlobalSettings::menuFont();
     TQFont menuFont = c->readFontEntry("menuFont", &defaultMenuFont);
 
     delete c;
@@ -468,7 +468,7 @@ void WidgetCanvas::drawSampleWidgets()
                       height(), cg, TRUE, 2, &brush);
 
     // Standard text
-    TQFont fnt = KGlobalSettings::generalFont();
+    TQFont fnt = TDEGlobalSettings::generalFont();
     paint.setFont( fnt );
     paint.setPen( windowTxt );
     paint.drawText( 140, 127-20, i18n( "Standard text") );
-- 
cgit v1.2.1