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

---
 src/libgui/breakpoint_view.cpp | 2 +-
 src/libgui/config_center.cpp   | 2 +-
 src/libgui/config_gen.cpp      | 2 +-
 src/libgui/console.cpp         | 2 +-
 src/libgui/device_gui.cpp      | 2 +-
 src/libgui/editor.cpp          | 2 +-
 src/libgui/editor_manager.cpp  | 2 +-
 src/libgui/global_config.cpp   | 2 +-
 src/libgui/hex_editor.cpp      | 4 ++--
 src/libgui/likeback.cpp        | 4 ++--
 src/libgui/new_dialogs.cpp     | 2 +-
 src/libgui/object_view.cpp     | 2 +-
 src/libgui/project_editor.cpp  | 2 +-
 src/libgui/project_manager.cpp | 2 +-
 src/libgui/register_view.cpp   | 2 +-
 src/libgui/text_editor.cpp     | 2 +-
 src/libgui/toplevel.cpp        | 4 ++--
 17 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/libgui')

diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp
index 0a1f081..5375cf4 100644
--- a/src/libgui/breakpoint_view.cpp
+++ b/src/libgui/breakpoint_view.cpp
@@ -9,7 +9,7 @@
 #include "breakpoint_view.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpopupmenu.h>
 
 #include "main_global.h"
diff --git a/src/libgui/config_center.cpp b/src/libgui/config_center.cpp
index bf7afc0..6806a7b 100644
--- a/src/libgui/config_center.cpp
+++ b/src/libgui/config_center.cpp
@@ -16,7 +16,7 @@
 #include <tqtabwidget.h>
 #include <tqtimer.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include "global_config.h"
diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp
index 01dc06b..d58be6e 100644
--- a/src/libgui/config_gen.cpp
+++ b/src/libgui/config_gen.cpp
@@ -10,7 +10,7 @@
 
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "device_gui.h"
 #include "devices/base/generic_memory.h"
diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp
index aab7b88..693b831 100644
--- a/src/libgui/console.cpp
+++ b/src/libgui/console.cpp
@@ -12,7 +12,7 @@
 #include <tqlabel.h>
 #include <tqdir.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kde_terminal_interface.h>
 
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index a5e1a1a..2066b06 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -17,7 +17,7 @@
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "devices/list/device_list.h"
 #include "devices/base/device_group.h"
diff --git a/src/libgui/editor.cpp b/src/libgui/editor.cpp
index e5cea2e..1577a97 100644
--- a/src/libgui/editor.cpp
+++ b/src/libgui/editor.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "editor.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "common/gui/purl_gui.h"
 #include "common/gui/misc_gui.h"
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp
index be56c63..53e47bf 100644
--- a/src/libgui/editor_manager.cpp
+++ b/src/libgui/editor_manager.cpp
@@ -13,7 +13,7 @@
 #include <tqdragobject.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp
index 20d1ad3..d85eadd 100644
--- a/src/libgui/global_config.cpp
+++ b/src/libgui/global_config.cpp
@@ -11,7 +11,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "progs/list/prog_list.h"
 #include "tools/list/tool_list.h"
diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp
index 395ede5..bae5c99 100644
--- a/src/libgui/hex_editor.cpp
+++ b/src/libgui/hex_editor.cpp
@@ -18,8 +18,8 @@
 #include <tqlabel.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include "devices/base/device_group.h"
 #include "devices/gui/device_group_ui.h"
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index cdc3eef..fa505f2 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -23,9 +23,9 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
diff --git a/src/libgui/new_dialogs.cpp b/src/libgui/new_dialogs.cpp
index 4f4cfe3..a60be74 100644
--- a/src/libgui/new_dialogs.cpp
+++ b/src/libgui/new_dialogs.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 #include "new_dialogs.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 
diff --git a/src/libgui/object_view.cpp b/src/libgui/object_view.cpp
index 1854b8a..0ad894d 100644
--- a/src/libgui/object_view.cpp
+++ b/src/libgui/object_view.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "object_view.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "devices/base/device_group.h"
 #include "devices/pic/pic/pic_memory.h"
diff --git a/src/libgui/project_editor.cpp b/src/libgui/project_editor.cpp
index 331bb55..3e22399 100644
--- a/src/libgui/project_editor.cpp
+++ b/src/libgui/project_editor.cpp
@@ -11,7 +11,7 @@
 
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "project.h"
 #include "tools/list/compile_config.h"
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index 58c33e6..1553697 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -15,7 +15,7 @@
 #include <tqtimer.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
diff --git a/src/libgui/register_view.cpp b/src/libgui/register_view.cpp
index 4f2aaff..40462a3 100644
--- a/src/libgui/register_view.cpp
+++ b/src/libgui/register_view.cpp
@@ -12,7 +12,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "devices/base/device_group.h"
 #include "devices/gui/device_group_ui.h"
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index 68857cd..f064ec4 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -17,7 +17,7 @@
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdetexteditor/markinterface.h>
 
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index b241ce4..a4dc4dc 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kedittoolbar.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <khelpmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include "gui_debug_manager.h"
 #include "hex_editor.h"
-- 
cgit v1.2.1