From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:55:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

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

(limited to 'kcontrol/colors')

diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index 1572f4b7b..45e3932da 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -26,11 +26,11 @@
 #include <kcursor.h>
 #include <tdefiledialog.h>
 #include <kgenericfactory.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <kipc.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 684e9d6d3..b08ef6135 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -15,9 +15,9 @@
 
 #include <kcolordrag.h>
 #include <kpixmapeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 
 #include "widgetcanvas.h"
@@ -280,7 +280,7 @@ void WidgetCanvas::drawSampleWidgets()
 
     TDEConfig * c = new TDEConfig("kcmfonts");
 
-    // Keep in sync with kglobalsettings.
+    // Keep in sync with tdeglobalsettings.
 
     TQFont windowFontGuess(TDEGlobalSettings::generalFont().family(), 12, TQFont::SansSerif, true);
     windowFontGuess.setPixelSize(12);
-- 
cgit v1.2.3