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/style/kcmstyle.cpp              | 4 ++--
 kcontrol/style/keramik/keramitdeconf.cpp | 4 ++--
 kcontrol/style/main.cpp                  | 4 ++--
 kcontrol/style/menupreview.cpp           | 2 +-
 kcontrol/style/styleconfdialog.cpp       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kcontrol/style')

diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 1b2477398..f6925a0ba 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -43,14 +43,14 @@
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kipc.h>
 #include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <klibloader.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <tdestyle.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/style/keramik/keramitdeconf.cpp b/kcontrol/style/keramik/keramitdeconf.cpp
index 742842876..6b73662df 100644
--- a/kcontrol/style/keramik/keramitdeconf.cpp
+++ b/kcontrol/style/keramik/keramitdeconf.cpp
@@ -25,8 +25,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 #include <tqsettings.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "keramitdeconf.h"
 
diff --git a/kcontrol/style/main.cpp b/kcontrol/style/main.cpp
index 334229f4e..7748e9ea7 100644
--- a/kcontrol/style/main.cpp
+++ b/kcontrol/style/main.cpp
@@ -1,5 +1,5 @@
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "kcmstyle.h"
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index ecb26816a..9b5edb672 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -24,7 +24,7 @@
 
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kimageeffect.h>
 #include <kiconloader.h>
 
diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp
index 1623a3a21..8cb426b3f 100644
--- a/kcontrol/style/styleconfdialog.cpp
+++ b/kcontrol/style/styleconfdialog.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "styleconfdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName):
   KDialogBase(parent, "StyleConfigDialog",
-- 
cgit v1.2.1