summaryrefslogtreecommitdiffstats
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
parent6f617c4181afa90f3eba14139d4f92eb98834899 (diff)
downloadpiklab-08396682f3324c6c1266be6a084793b261ada6a4.tar.gz
piklab-08396682f3324c6c1266be6a084793b261ada6a4.zip
Rename many classes and header files to avoid conflicts with KDE4
-rw-r--r--src/common/gui/dialog.h2
-rw-r--r--src/common/gui/editlistbox.h2
-rw-r--r--src/common/gui/list_container.h4
-rw-r--r--src/common/gui/list_view.h2
-rw-r--r--src/common/gui/misc_gui.cpp2
-rw-r--r--src/devices/gui/memory_editor.cpp2
-rw-r--r--src/devices/pic/gui/pic_group_ui.cpp2
-rw-r--r--src/devices/pic/gui/pic_memory_editor.cpp2
-rw-r--r--src/libgui/config_center.cpp2
-rw-r--r--src/libgui/device_gui.cpp2
-rw-r--r--src/libgui/editor_manager.cpp4
-rw-r--r--src/libgui/gui_prog_manager.cpp2
-rw-r--r--src/libgui/project_manager.cpp2
-rw-r--r--src/libgui/project_manager_ui.h2
-rw-r--r--src/libgui/text_editor.cpp2
-rw-r--r--src/libgui/toplevel.cpp4
-rw-r--r--src/libgui/toplevel_ui.h2
-rw-r--r--src/progs/gui/prog_group_ui.cpp2
18 files changed, 21 insertions, 21 deletions
diff --git a/src/common/gui/dialog.h b/src/common/gui/dialog.h
index 555e857..d675314 100644
--- a/src/common/gui/dialog.h
+++ b/src/common/gui/dialog.h
@@ -11,7 +11,7 @@
#include <tqlayout.h>
#include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
//-----------------------------------------------------------------------------
class Dialog : public KDialogBase
diff --git a/src/common/gui/editlistbox.h b/src/common/gui/editlistbox.h
index 553ac16..8bcee74 100644
--- a/src/common/gui/editlistbox.h
+++ b/src/common/gui/editlistbox.h
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <klineedit.h>
#include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "common/common/qflags.h"
diff --git a/src/common/gui/list_container.h b/src/common/gui/list_container.h
index b52f9e2..ebeb6de 100644
--- a/src/common/gui/list_container.h
+++ b/src/common/gui/list_container.h
@@ -9,8 +9,8 @@
#ifndef LIST_CONTAINER_H
#define LIST_CONTAINER_H
-#include <kpopupmenu.h>
-#include <klistview.h>
+#include <tdepopupmenu.h>
+#include <tdelistview.h>
//----------------------------------------------------------------------------
class ListContainer
diff --git a/src/common/gui/list_view.h b/src/common/gui/list_view.h
index 90e9595..41920bd 100644
--- a/src/common/gui/list_view.h
+++ b/src/common/gui/list_view.h
@@ -13,7 +13,7 @@
#include <tqvaluevector.h>
#define private public
#define protected public
-#include <klistview.h>
+#include <tdelistview.h>
#undef private
#undef protected
diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp
index 2400070..607156e 100644
--- a/src/common/gui/misc_gui.cpp
+++ b/src/common/gui/misc_gui.cpp
@@ -22,7 +22,7 @@
#include <kcursor.h>
#include <kiconloader.h>
#include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <ktabbar.h>
#include "dialog.h"
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"
diff --git a/src/libgui/config_center.cpp b/src/libgui/config_center.cpp
index e91a956..78a0f82 100644
--- a/src/libgui/config_center.cpp
+++ b/src/libgui/config_center.cpp
@@ -17,7 +17,7 @@
#include <tqtimer.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include "global_config.h"
#include "device_gui.h"
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index 0ca3b32..550104a 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -16,7 +16,7 @@
#include <tqsplitter.h>
#include <kiconloader.h>
#include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include "devices/list/device_list.h"
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp
index 47bf16b..2656e39 100644
--- a/src/libgui/editor_manager.cpp
+++ b/src/libgui/editor_manager.cpp
@@ -15,8 +15,8 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
#include "text_editor.h"
#include "hex_editor.h"
diff --git a/src/libgui/gui_prog_manager.cpp b/src/libgui/gui_prog_manager.cpp
index f76e6e7..41fad52 100644
--- a/src/libgui/gui_prog_manager.cpp
+++ b/src/libgui/gui_prog_manager.cpp
@@ -8,7 +8,7 @@
***************************************************************************/
#include "gui_prog_manager.h"
-#include <kaction.h>
+#include <tdeaction.h>
#include "progs/base/generic_prog.h"
#include "progs/base/prog_group.h"
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index c568ebd..c2877f3 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -17,7 +17,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include "project.h"
diff --git a/src/libgui/project_manager_ui.h b/src/libgui/project_manager_ui.h
index 32852af..dd9ae01 100644
--- a/src/libgui/project_manager_ui.h
+++ b/src/libgui/project_manager_ui.h
@@ -10,7 +10,7 @@
#ifndef PROJECT_MANAGER_UI_H
#define PROJECT_MANAGER_UI_H
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include "common/global/purl.h"
#include "common/gui/misc_gui.h"
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index 45d340c..89eb7c6 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -14,7 +14,7 @@
#include <tqlayout.h>
#include <klibloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <klocale.h>
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index 61739e0..632d3d8 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -25,11 +25,11 @@
#include <kedittoolbar.h>
#include <kapplication.h>
#include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kcmdlineargs.h>
#include <tdeio/observer.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <khelpmenu.h>
#include <kmenubar.h>
diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h
index 4ba1714..1c63f8c 100644
--- a/src/libgui/toplevel_ui.h
+++ b/src/libgui/toplevel_ui.h
@@ -11,7 +11,7 @@
#include <tqtoolbutton.h>
#include <kdockwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "common/gui/key_gui.h"
namespace Programmer { class Group; }
diff --git a/src/progs/gui/prog_group_ui.cpp b/src/progs/gui/prog_group_ui.cpp
index a835fa6..b1ecc92 100644
--- a/src/progs/gui/prog_group_ui.cpp
+++ b/src/progs/gui/prog_group_ui.cpp
@@ -9,7 +9,7 @@
#include "prog_group_ui.h"
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kiconloader.h>
#include "common/common/misc.h"