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/keys/commandShortcuts.cpp | 4 ++--
 kcontrol/keys/keyconfig.cpp        | 4 ++--
 kcontrol/keys/main.cpp             | 2 +-
 kcontrol/keys/modifiers.cpp        | 4 ++--
 kcontrol/keys/shortcuts.cpp        | 4 ++--
 kcontrol/keys/treeview.cpp         | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kcontrol/keys')

diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index 0ab7f1205..4ae379a50 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -29,11 +29,11 @@
 
 #include <kactivelabel.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 #include <khotkeys.h>
 #include <kkeybutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static bool treeFilled = false;
 CommandShortcutsModule::CommandShortcutsModule( TQWidget *parent, const char *name )
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index 74f9d5446..9785d22da 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -19,10 +19,10 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp
index 736a937bd..c9aa14813 100644
--- a/kcontrol/keys/main.cpp
+++ b/kcontrol/keys/main.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 
 #include "commandShortcuts.h"
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index ce39b0bf3..39dfb7010 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -12,8 +12,8 @@
 #include <kdialog.h>
 #include <kkeynative.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #define XK_MISCELLANY
 #define XK_XKB_KEYS
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index d81fe74ca..e7f599dda 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -36,8 +36,8 @@
 #include <kipc.h>
 #include <kkeynative.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeshortcutlist.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 361c1cfb8..36d0e3bf4 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -26,7 +26,7 @@
 #include <tqcursor.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
 
-- 
cgit v1.2.1