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

---
 kxkb/kcmlayout.cpp      | 4 ++--
 kxkb/kcmmisc.cpp        | 4 ++--
 kxkb/kxkb.cpp           | 6 +++---
 kxkb/kxkbtraywindow.cpp | 2 +-
 kxkb/pixmap.cpp         | 2 +-
 kxkb/rules.cpp          | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kxkb')

diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp
index fb323ad28..2c601856f 100644
--- a/kxkb/kcmlayout.cpp
+++ b/kxkb/kcmlayout.cpp
@@ -15,9 +15,9 @@
 #include <tqspinbox.h>
 
 #include <kkeydialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
index 56d517b62..9436d730d 100644
--- a/kxkb/kcmmisc.cpp
+++ b/kxkb/kcmmisc.cpp
@@ -37,11 +37,11 @@
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kdialog.h>
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index eae45523d..2db4fb60f 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -34,13 +34,13 @@ DESCRIPTION
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kglobalaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <twinmodule.h>
 #include <twin.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kstandarddirs.h>
 #include <kipc.h>
 #include <tdeaction.h>
diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp
index dae4f7092..ec91df670 100644
--- a/kxkb/kxkbtraywindow.cpp
+++ b/kxkb/kxkbtraywindow.cpp
@@ -12,7 +12,7 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index 25c9f6d7d..8752c258a 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -6,7 +6,7 @@
 #include <tqdict.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "pixmap.h"
diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp
index 28d8f687c..20f817602 100644
--- a/kxkb/rules.cpp
+++ b/kxkb/rules.cpp
@@ -6,8 +6,8 @@
 #include <tqdir.h>
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <config.h>
 
-- 
cgit v1.2.1