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

---
 twin/lib/kcommondecoration.cpp     | 2 +-
 twin/lib/kdecoration.cpp           | 2 +-
 twin/lib/kdecoration_p.cpp         | 2 +-
 twin/lib/kdecoration_plugins_p.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'twin/lib')

diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 74bf26dc7..997845a5c 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -33,7 +33,7 @@
 
 #include <tdeapplication.h>
 #include <kdecorationfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index c9888ff96..b2332c514 100644
--- a/twin/lib/kdecoration.cpp
+++ b/twin/lib/kdecoration.cpp
@@ -26,7 +26,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <kdebug.h>
 #include <tqapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <assert.h>
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xlib.h>
diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp
index 73e2d9871..2cca5d556 100644
--- a/twin/lib/kdecoration_p.cpp
+++ b/twin/lib/kdecoration_p.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include "kdecoration_p.h"
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqpalette.h>
 #include <tqapplication.h>
 #include <assert.h>
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index 632539f66..319b7305e 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -27,7 +27,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <assert.h>
 
-- 
cgit v1.2.1