summaryrefslogtreecommitdiffstats
path: root/src/devices/gui/memory_editor.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:15:40 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:15:40 -0600
commit08396682f3324c6c1266be6a084793b261ada6a4 (patch)
tree2b20125911d9adc6d1a213563267b97827b3cdff /src/devices/gui/memory_editor.cpp
parent6f617c4181afa90f3eba14139d4f92eb98834899 (diff)
downloadpiklab-08396682f3324c6c1266be6a084793b261ada6a4.tar.gz
piklab-08396682f3324c6c1266be6a084793b261ada6a4.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/devices/gui/memory_editor.cpp')
-rw-r--r--src/devices/gui/memory_editor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/gui/memory_editor.cpp b/src/devices/gui/memory_editor.cpp
index 5e71ddb..79e30b6 100644
--- a/src/devices/gui/memory_editor.cpp
+++ b/src/devices/gui/memory_editor.cpp
@@ -17,7 +17,7 @@
#include <tqpopupmenu.h>
#include <klocale.h>
#include <kpushbutton.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "common/common/misc.h"
#include "hex_word_editor.h"