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/devices/base/device_group.cpp              | 2 +-
 src/devices/gui/memory_editor.cpp              | 2 +-
 src/devices/mem24/gui/mem24_hex_view.cpp       | 2 +-
 src/devices/mem24/gui/mem24_memory_editor.cpp  | 2 +-
 src/devices/pic/gui/pic_config_word_editor.cpp | 2 +-
 src/devices/pic/gui/pic_hex_view.cpp           | 2 +-
 src/devices/pic/gui/pic_memory_editor.cpp      | 2 +-
 src/devices/pic/gui/pic_register_view.cpp      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/devices')

diff --git a/src/devices/base/device_group.cpp b/src/devices/base/device_group.cpp
index 8cace79..0509647 100644
--- a/src/devices/base/device_group.cpp
+++ b/src/devices/base/device_group.cpp
@@ -10,7 +10,7 @@
 
 #if !defined(NO_KDE)
 #  include <tqpainter.h>
-#  include <kglobal.h>
+#  include <tdeglobal.h>
 
 TQColor Device::statusColor(Status status)
 {
diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp
index 79e30b6..c33891a 100644
--- a/src/devices/gui/memory_editor.cpp
+++ b/src/devices/gui/memory_editor.cpp
@@ -15,7 +15,7 @@
 #include <tqgrid.h>
 #include <tqtimer.h>
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdeaction.h>
 
diff --git a/src/devices/mem24/gui/mem24_hex_view.cpp b/src/devices/mem24/gui/mem24_hex_view.cpp
index 349e2fc..4c30905 100644
--- a/src/devices/mem24/gui/mem24_hex_view.cpp
+++ b/src/devices/mem24/gui/mem24_hex_view.cpp
@@ -10,7 +10,7 @@
 
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "mem24_memory_editor.h"
 
diff --git a/src/devices/mem24/gui/mem24_memory_editor.cpp b/src/devices/mem24/gui/mem24_memory_editor.cpp
index c395b17..7ebd194 100644
--- a/src/devices/mem24/gui/mem24_memory_editor.cpp
+++ b/src/devices/mem24/gui/mem24_memory_editor.cpp
@@ -9,7 +9,7 @@
 #include "mem24_memory_editor.h"
 
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include "common/gui/misc_gui.h"
diff --git a/src/devices/pic/gui/pic_config_word_editor.cpp b/src/devices/pic/gui/pic_config_word_editor.cpp
index 0931076..b40adf5 100644
--- a/src/devices/pic/gui/pic_config_word_editor.cpp
+++ b/src/devices/pic/gui/pic_config_word_editor.cpp
@@ -12,7 +12,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "common/common/misc.h"
 #include "common/gui/misc_gui.h"
diff --git a/src/devices/pic/gui/pic_hex_view.cpp b/src/devices/pic/gui/pic_hex_view.cpp
index bbcc161..89d1a2f 100644
--- a/src/devices/pic/gui/pic_hex_view.cpp
+++ b/src/devices/pic/gui/pic_hex_view.cpp
@@ -12,7 +12,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "pic_memory_editor.h"
 #include "pic_config_editor.h"
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index e1fb50b..2f5b0b7 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqpixmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdeaction.h>
 
diff --git a/src/devices/pic/gui/pic_register_view.cpp b/src/devices/pic/gui/pic_register_view.cpp
index d5467fd..8848d85 100644
--- a/src/devices/pic/gui/pic_register_view.cpp
+++ b/src/devices/pic/gui/pic_register_view.cpp
@@ -15,7 +15,7 @@
 #include <tqcombobox.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include "libgui/main_global.h"
-- 
cgit v1.2.1