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

---
 khotkeys/kcontrol/action_group_tab.cpp        | 4 ++--
 khotkeys/kcontrol/action_list_widget.cpp      | 2 +-
 khotkeys/kcontrol/actions_listview_widget.cpp | 2 +-
 khotkeys/kcontrol/condition_list_widget.cpp   | 4 ++--
 khotkeys/kcontrol/dcop_widget.cpp             | 4 ++--
 khotkeys/kcontrol/general_tab.cpp             | 2 +-
 khotkeys/kcontrol/gesturerecordpage.cpp       | 4 ++--
 khotkeys/kcontrol/gestures_settings_tab.cpp   | 2 +-
 khotkeys/kcontrol/info_tab.cpp                | 2 +-
 khotkeys/kcontrol/kcmkhotkeys.cpp             | 6 +++---
 khotkeys/kcontrol/menuedit.cpp                | 4 ++--
 khotkeys/kcontrol/tab_widget.cpp              | 2 +-
 khotkeys/kcontrol/triggers_tab.cpp            | 2 +-
 khotkeys/kcontrol/voice_settings_tab.cpp      | 2 +-
 khotkeys/kcontrol/voicerecorder.cpp           | 6 +++---
 khotkeys/kcontrol/voicerecordpage.cpp         | 4 ++--
 khotkeys/kcontrol/windowdef_list_widget.cpp   | 2 +-
 17 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'khotkeys/kcontrol')

diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp
index 8a297b933..1bdeffd75 100644
--- a/khotkeys/kcontrol/action_group_tab.cpp
+++ b/khotkeys/kcontrol/action_group_tab.cpp
@@ -19,8 +19,8 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 
 #include <actions.h>
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index 33dc80543..79744a09e 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <khlistview.h>
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index 5048289df..e528005ed 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -18,7 +18,7 @@
 
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqdragobject.h>
 
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 86ff8f47c..ba3be5e71 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -23,8 +23,8 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <khlistview.h>
 
diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp
index a410109fd..bee149860 100644
--- a/khotkeys/kcontrol/dcop_widget.cpp
+++ b/khotkeys/kcontrol/dcop_widget.cpp
@@ -20,8 +20,8 @@
 #include <tqpushbutton.h>
 
 #include <krun.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <actions.h>
 
diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp
index 1190780dc..1cd98d461 100644
--- a/khotkeys/kcontrol/general_tab.cpp
+++ b/khotkeys/kcontrol/general_tab.cpp
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <ktextedit.h>
 
diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp
index af2fb8cdc..e9e768bb0 100644
--- a/khotkeys/kcontrol/gesturerecordpage.cpp
+++ b/khotkeys/kcontrol/gesturerecordpage.cpp
@@ -13,8 +13,8 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "gesturerecordpage.h"
 #include "gesturerecorder.h"
diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp
index 2b5a8ff42..8585fedbc 100644
--- a/khotkeys/kcontrol/gestures_settings_tab.cpp
+++ b/khotkeys/kcontrol/gestures_settings_tab.cpp
@@ -16,7 +16,7 @@
 
 #include "gestures_settings_tab.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcombobox.h>
 #include <knuminput.h>
 #include <tqcheckbox.h>
diff --git a/khotkeys/kcontrol/info_tab.cpp b/khotkeys/kcontrol/info_tab.cpp
index 7a2e0c916..feba07dd1 100644
--- a/khotkeys/kcontrol/info_tab.cpp
+++ b/khotkeys/kcontrol/info_tab.cpp
@@ -19,7 +19,7 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KHotKeys
 {
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 5d6e1aad7..5f9e4d5fc 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -24,14 +24,14 @@
 
 #include <tdecmodule.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <ksimpleconfig.h>
 #include <tdefiledialog.h>
 #include <dcopref.h>
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 9095cff2c..08b8a3c22 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -18,8 +18,8 @@
 
 #include "menuedit.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index 243543519..d3ca4afbe 100644
--- a/khotkeys/kcontrol/tab_widget.cpp
+++ b/khotkeys/kcontrol/tab_widget.cpp
@@ -18,7 +18,7 @@
 
 #include <typeinfo>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <actions.h>
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 683aad32a..d4f7ff9d3 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -25,7 +25,7 @@
 #include <tqheader.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeshortcut.h>
 #include <tdeconfig.h>
diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp
index 277e2f675..1d97d69ab 100644
--- a/khotkeys/kcontrol/voice_settings_tab.cpp
+++ b/khotkeys/kcontrol/voice_settings_tab.cpp
@@ -10,7 +10,7 @@
 
 #include "voice_settings_tab.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcombobox.h>
 #include <knuminput.h>
 #include <tqcheckbox.h>
diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp
index 50d1fa2f9..fc231a82c 100644
--- a/khotkeys/kcontrol/voicerecorder.cpp
+++ b/khotkeys/kcontrol/voicerecorder.cpp
@@ -18,11 +18,11 @@
 #include "khotkeysglobal.h"
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <kstandarddirs.h>
 
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index fec07e22f..1c7f8c938 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -14,8 +14,8 @@
 #include <klineedit.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "voicerecordpage.h"
 #include "voicerecorder.h"
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index 471aab743..dc16d780f 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -23,7 +23,7 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <khlistview.h>
 
-- 
cgit v1.2.3