summaryrefslogtreecommitdiffstats
path: root/src/devices/mem24/gui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:51:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:51:08 -0600
commitb0699f7c1623811cff1fe3794521546d30e84ee1 (patch)
tree9d95a691cc5086f0d348984b1fc86d433cdfad53 /src/devices/mem24/gui
parentf037da190037979080d407f3c6f0a88026b6bb91 (diff)
downloadpiklab-b0699f7c1623811cff1fe3794521546d30e84ee1.tar.gz
piklab-b0699f7c1623811cff1fe3794521546d30e84ee1.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/devices/mem24/gui')
-rw-r--r--src/devices/mem24/gui/mem24_hex_view.cpp2
-rw-r--r--src/devices/mem24/gui/mem24_memory_editor.cpp2
2 files changed, 2 insertions, 2 deletions
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"