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/fonts/fonts.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/fonts')

diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index ef338d92b..93d76c28e 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -162,7 +162,7 @@ void FontUseItem::readFont( bool useDefaults )
 
   bool deleteme = false;
   if (_rcfile.isEmpty())
-    config = KGlobal::config();
+    config = TDEGlobal::config();
   else
   {
     config = new KConfig(_rcfile, true);
@@ -182,7 +182,7 @@ void FontUseItem::writeFont()
   KConfigBase *config;
 
   if (_rcfile.isEmpty()) {
-    config = KGlobal::config();
+    config = TDEGlobal::config();
     config->setGroup(_rcgroup);
     config->writeEntry(_rckey, font(), true, true);
   } else {
@@ -713,7 +713,7 @@ void KFonts::save()
 
   for ( FontUseItem* i = fontUseList.first(); i; i = fontUseList.next() )
       i->writeFont();
-  KGlobal::config()->sync();
+  TDEGlobal::config()->sync();
 
   KConfig cfgfonts("kcmfonts");
   cfgfonts.setGroup("General");
@@ -729,7 +729,7 @@ void KFonts::save()
       proc << "xrdb" << "-quiet" << "-remove" << "-nocpp";
       proc.writeStdin( TQCString( "Xft.dpi" ), true );
       proc.closeWhenDone();
-      proc.start( KProcess::Block );
+      proc.start( TDEProcess::Block );
   }
 
   // KDE-1.x support
-- 
cgit v1.2.1