diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:15:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:15:40 -0600 |
| commit | 08396682f3324c6c1266be6a084793b261ada6a4 (patch) | |
| tree | 2b20125911d9adc6d1a213563267b97827b3cdff /src/devices | |
| parent | 6f617c4181afa90f3eba14139d4f92eb98834899 (diff) | |
| download | piklab-08396682f3324c6c1266be6a084793b261ada6a4.tar.gz piklab-08396682f3324c6c1266be6a084793b261ada6a4.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/gui/memory_editor.cpp | 2 | ||||
| -rw-r--r-- | src/devices/pic/gui/pic_group_ui.cpp | 2 | ||||
| -rw-r--r-- | src/devices/pic/gui/pic_memory_editor.cpp | 2 |
3 files changed, 3 insertions, 3 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" 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" |