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

---
 kstyles/highcontrast/config/highcontrastconfig.cpp | 4 ++--
 kstyles/klegacy/klegacystyle.cpp                   | 2 +-
 kstyles/klegacy/plugin.cpp                         | 2 +-
 kstyles/kthemestyle/kthemestyle.cpp                | 2 +-
 kstyles/plastik/config/plastitdeconf.cpp           | 4 ++--
 kstyles/utils/installtheme/main.cpp                | 4 ++--
 kstyles/web/plugin.cpp                             | 2 +-
 kstyles/web/webstyle.cpp                           | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kstyles')

diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp
index 9de7f1bfd..f271113ca 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.cpp
+++ b/kstyles/highcontrast/config/highcontrastconfig.cpp
@@ -28,8 +28,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 "highcontrastconfig.h"
 
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index 5c083632e..a169de874 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -24,7 +24,7 @@
 
 #include "klegacystyle.h"
 #include "klegacystyle.moc"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #define INCLUDE_MENUITEM_DEF
diff --git a/kstyles/klegacy/plugin.cpp b/kstyles/klegacy/plugin.cpp
index 5d3a58492..558b54e73 100644
--- a/kstyles/klegacy/plugin.cpp
+++ b/kstyles/klegacy/plugin.cpp
@@ -1,5 +1,5 @@
 #include "klegacystyle.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C" {
     TDEStyle* allocate();
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 4cc374e5d..a164821b1 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -53,7 +53,7 @@ Port version 0.9.7
 #include <tqpalette.h>
 #include <tqtabbar.h>
 #include <tqtoolbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdrawutil.h>
 #include <tqdrawutil.h>
 #include <tqprogressbar.h>
diff --git a/kstyles/plastik/config/plastitdeconf.cpp b/kstyles/plastik/config/plastitdeconf.cpp
index 8d3e4acfd..38cda2426 100644
--- a/kstyles/plastik/config/plastitdeconf.cpp
+++ b/kstyles/plastik/config/plastitdeconf.cpp
@@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqsettings.h>
 #include <tqcolor.h>
 #include <tqgroupbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <kdemacros.h>
 
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 274c2d335..3ce63dfdf 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/kstyles/web/plugin.cpp b/kstyles/web/plugin.cpp
index 6ab10ebd8..bd4371ce3 100644
--- a/kstyles/web/plugin.cpp
+++ b/kstyles/web/plugin.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include "webstyle.h"
 
 extern "C"
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index d96688ee0..b3b461954 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
-- 
cgit v1.2.1