summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:13:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:13:12 -0600
commitc0695dee383cf8b5a856dc412a54238926599956 (patch)
tree722fff466787adda2fceda598117d7e7b5560ca0 /src
parent151a9ebb248b018d3036f7da2f58f404851917d6 (diff)
downloadpiklab-c0695dee383cf8b5a856dc412a54238926599956.tar.gz
piklab-c0695dee383cf8b5a856dc412a54238926599956.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/data/app_data/piklabui.rc2
-rw-r--r--src/libgui/console.cpp2
-rw-r--r--src/libgui/hex_editor.h2
-rw-r--r--src/libgui/text_editor.cpp4
-rw-r--r--src/piklab-coff/Makefile.am2
-rw-r--r--src/piklab-hex/Makefile.am2
-rw-r--r--src/piklab-prog/Makefile.am2
-rw-r--r--src/piklab-test/generators/Makefile.am6
-rw-r--r--src/piklab-test/misc/Makefile.am2
-rw-r--r--src/piklab-test/save_load_memory/Makefile.am2
-rw-r--r--src/piklab/Makefile.am4
11 files changed, 15 insertions, 15 deletions
diff --git a/src/data/app_data/piklabui.rc b/src/data/app_data/piklabui.rc
index b6c4845..23caad7 100644
--- a/src/data/app_data/piklabui.rc
+++ b/src/data/app_data/piklabui.rc
@@ -185,7 +185,7 @@
<Action name="debug_reset" />
</ToolBar>
-<Menu name="ktexteditor_popup">
+<Menu name="tdetexteditor_popup">
<Action name="enable_breakpoint" />
<Action name="toggle_breakpoint" />
<Action name="clear_breakpoints" />
diff --git a/src/libgui/console.cpp b/src/libgui/console.cpp
index b2e30d7..aab7b88 100644
--- a/src/libgui/console.cpp
+++ b/src/libgui/console.cpp
@@ -13,7 +13,7 @@
#include <tqdir.h>
#include <klibloader.h>
#include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include <kde_terminal_interface.h>
ConsoleView::ConsoleView(TQWidget *parent)
diff --git a/src/libgui/hex_editor.h b/src/libgui/hex_editor.h
index 420eeeb..e0684a0 100644
--- a/src/libgui/hex_editor.h
+++ b/src/libgui/hex_editor.h
@@ -10,7 +10,7 @@
#ifndef HEX_EDITOR_H
#define HEX_EDITOR_H
-#include <kparts/part.h>
+#include <tdeparts/part.h>
#include "device_editor.h"
#include "devices/base/hex_buffer.h"
diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp
index dca5827..077b8d8 100644
--- a/src/libgui/text_editor.cpp
+++ b/src/libgui/text_editor.cpp
@@ -19,7 +19,7 @@
#include <kfiledialog.h>
#include <klocale.h>
#include <kapplication.h>
-#include <ktexteditor/markinterface.h>
+#include <tdetexteditor/markinterface.h>
#include "main_global.h"
#include "gui_debug_manager.h"
@@ -101,7 +101,7 @@ void TextEditor::addView()
v->setFocus();
v->child(0, "KateViewInternal")->installEventFilter(this);
KTextEditor::PopupMenuInterface *pmi = KTextEditor::popupMenuInterface(v);
- pmi->installPopup(&Main::popup("ktexteditor_popup"));
+ pmi->installPopup(&Main::popup("tdetexteditor_popup"));
// dispatch available space between views
TQValueList<int> list = _split->sizes();
diff --git a/src/piklab-coff/Makefile.am b/src/piklab-coff/Makefile.am
index 6ad9294..9240020 100644
--- a/src/piklab-coff/Makefile.am
+++ b/src/piklab-coff/Makefile.am
@@ -12,5 +12,5 @@ OBJ = $(top_builddir)/src/common/cli/libcli.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
piklab_coff_DEPENDENCIES = $(OBJ)
piklab_coff_LDADD = $(OBJ) $(LIB_KIO)
-piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
piklab_coff_SOURCES = main.cpp
diff --git a/src/piklab-hex/Makefile.am b/src/piklab-hex/Makefile.am
index 5617b1d..5aba2ef 100644
--- a/src/piklab-hex/Makefile.am
+++ b/src/piklab-hex/Makefile.am
@@ -11,5 +11,5 @@ OBJ = $(top_builddir)/src/common/cli/libcli.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
piklab_hex_DEPENDENCIES = $(OBJ)
piklab_hex_LDADD = $(OBJ) $(LIB_KIO)
-piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
piklab_hex_SOURCES = main.cpp
diff --git a/src/piklab-prog/Makefile.am b/src/piklab-prog/Makefile.am
index 215a7ff..2b04b9f 100644
--- a/src/piklab-prog/Makefile.am
+++ b/src/piklab-prog/Makefile.am
@@ -27,5 +27,5 @@ OBJ = $(top_builddir)/src/progs/list/libproglistnoui.la \
$(top_builddir)/src/common/common/libcommon.la
piklab_prog_DEPENDENCIES = $(OBJ)
piklab_prog_LDADD = $(OBJ) $(LIB_KIO) $(LIBUSB_LIBS) $(LIBREADLINE_LIBS)
-piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
piklab_prog_SOURCES = cmdline.cpp cli_prog_manager.cpp cli_debug_manager.cpp cli_interactive.cpp
diff --git a/src/piklab-test/generators/Makefile.am b/src/piklab-test/generators/Makefile.am
index bea15b6..382ec5e 100644
--- a/src/piklab-test/generators/Makefile.am
+++ b/src/piklab-test/generators/Makefile.am
@@ -17,15 +17,15 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
gputils_config_generator_check_DEPENDENCIES = $(OBJ)
gputils_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
-gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
gputils_config_generator_check_SOURCES = gputils_config_generator_check.cpp
gputils_template_generator_check_DEPENDENCIES = $(OBJ)
gputils_template_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
-gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
gputils_template_generator_check_SOURCES = gputils_template_generator_check.cpp
sdcc_config_generator_check_DEPENDENCIES = $(OBJ)
sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
-sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
sdcc_config_generator_check_SOURCES = sdcc_config_generator_check.cpp
diff --git a/src/piklab-test/misc/Makefile.am b/src/piklab-test/misc/Makefile.am
index d6d6b6c..7453bc3 100644
--- a/src/piklab-test/misc/Makefile.am
+++ b/src/piklab-test/misc/Makefile.am
@@ -6,5 +6,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la $(top_builddir)/src/common
$(top_builddir)/src/common/global/libglobal.la $(top_builddir)/src/common/common/libcommon.la
misc_check_DEPENDENCIES = $(OBJ)
misc_check_LDADD = $(OBJ) $(LIB_KIO)
-misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
misc_check_SOURCES = misc_check.cpp
diff --git a/src/piklab-test/save_load_memory/Makefile.am b/src/piklab-test/save_load_memory/Makefile.am
index 4c9375a..1f5fffb 100644
--- a/src/piklab-test/save_load_memory/Makefile.am
+++ b/src/piklab-test/save_load_memory/Makefile.am
@@ -14,5 +14,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
save_load_memory_check_DEPENDENCIES = $(OBJ)
save_load_memory_check_LDADD = $(OBJ) $(LIB_KIO)
-save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
save_load_memory_check_SOURCES = save_load_memory_check.cpp
diff --git a/src/piklab/Makefile.am b/src/piklab/Makefile.am
index 6ce837a..eb8b29b 100644
--- a/src/piklab/Makefile.am
+++ b/src/piklab/Makefile.am
@@ -57,7 +57,7 @@ OBJS = $(top_builddir)/src/libgui/libgui.la \
$(top_builddir)/src/devices/mem24/mem24/libmem24.la $(top_builddir)/src/devices/mem24/base/libmem24base.la \
$(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
-piklab_LDADD = $(OBJS) -lktexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
+piklab_LDADD = $(OBJS) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_KHTML) $(LIB_KPARTS) $(LIB_KIO)
piklab_DEPENDENCIES = $(OBJS)
-piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
piklab_SOURCES = main.cpp