summaryrefslogtreecommitdiffstats
path: root/src/devices/pic/gui
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:15:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:15:40 -0600
commit08396682f3324c6c1266be6a084793b261ada6a4 (patch)
tree2b20125911d9adc6d1a213563267b97827b3cdff /src/devices/pic/gui
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/pic/gui')
-rw-r--r--src/devices/pic/gui/pic_group_ui.cpp2
-rw-r--r--src/devices/pic/gui/pic_memory_editor.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/pic/gui/pic_group_ui.cpp b/src/devices/pic/gui/pic_group_ui.cpp
index 912423c..2dd5f00 100644
--- a/src/devices/pic/gui/pic_group_ui.cpp
+++ b/src/devices/pic/gui/pic_group_ui.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
#include "pic_group_ui.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include "libgui/main_global.h"
#include "pic_hex_view.h"
diff --git a/src/devices/pic/gui/pic_memory_editor.cpp b/src/devices/pic/gui/pic_memory_editor.cpp
index 219519f..e1fb50b 100644
--- a/src/devices/pic/gui/pic_memory_editor.cpp
+++ b/src/devices/pic/gui/pic_memory_editor.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kpushbutton.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "common/common/misc.h"
#include "pic_config_editor.h"