From 6f09ff652a524df004237e52270d4f808ecf1559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:58:21 +0200 Subject: Additional k => tde renaming and fixes --- src/common/nokde/nokde_tdelocale.h | 4 ++-- src/libgui/likeback.cpp | 2 +- src/piklab-coff/Makefile.am | 4 ++-- src/piklab-hex/Makefile.am | 4 ++-- src/piklab-prog/Makefile.am | 4 ++-- src/piklab-test/checksum/Makefile.am | 2 +- src/piklab-test/generators/Makefile.am | 12 ++++++------ src/piklab-test/misc/Makefile.am | 4 ++-- src/piklab-test/save_load_memory/Makefile.am | 4 ++-- src/piklab/Makefile.am | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/common/nokde/nokde_tdelocale.h b/src/common/nokde/nokde_tdelocale.h index 90b5f47..1363bb2 100644 --- a/src/common/nokde/nokde_tdelocale.h +++ b/src/common/nokde/nokde_tdelocale.h @@ -1,5 +1,5 @@ -#ifndef NOKDE_KLOCALE_H -#define NOKDE_KLOCALE_H +#ifndef NOKDE_TDELOCALE_H +#define NOKDE_TDELOCALE_H #undef TDECORE_EXPORT #define TDECORE_EXPORT diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index 1253232..af74e4b 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -472,7 +472,7 @@ void LikeBack::endFetchingEmailFrom() // m_process = 0; // m_configureEmail->setEnabled(true); - // ### KDE4: why oh why is KEmailSettings in kio? + // ### KDE4: why oh why is KEmailSettings in tdeio? TDEConfig emailConf( TQString::fromLatin1("emaildefaults") ); // find out the default profile diff --git a/src/piklab-coff/Makefile.am b/src/piklab-coff/Makefile.am index 9240020..ff2e8f5 100644 --- a/src/piklab-coff/Makefile.am +++ b/src/piklab-coff/Makefile.am @@ -11,6 +11,6 @@ OBJ = $(top_builddir)/src/common/cli/libcli.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_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) -ltdetexteditor +piklab_coff_LDADD = $(OBJ) $(LIB_TDEIO) +piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor piklab_coff_SOURCES = main.cpp diff --git a/src/piklab-hex/Makefile.am b/src/piklab-hex/Makefile.am index 5aba2ef..a071a5e 100644 --- a/src/piklab-hex/Makefile.am +++ b/src/piklab-hex/Makefile.am @@ -10,6 +10,6 @@ OBJ = $(top_builddir)/src/common/cli/libcli.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_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) -ltdetexteditor +piklab_hex_LDADD = $(OBJ) $(LIB_TDEIO) +piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor piklab_hex_SOURCES = main.cpp diff --git a/src/piklab-prog/Makefile.am b/src/piklab-prog/Makefile.am index 2b04b9f..23430a6 100644 --- a/src/piklab-prog/Makefile.am +++ b/src/piklab-prog/Makefile.am @@ -26,6 +26,6 @@ OBJ = $(top_builddir)/src/progs/list/libproglistnoui.la \ $(top_builddir)/src/devices/base/libdevicebase.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) -ltdetexteditor +piklab_prog_LDADD = $(OBJ) $(LIB_TDEIO) $(LIBUSB_LIBS) $(LIBREADLINE_LIBS) +piklab_prog_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor piklab_prog_SOURCES = cmdline.cpp cli_prog_manager.cpp cli_debug_manager.cpp cli_interactive.cpp diff --git a/src/piklab-test/checksum/Makefile.am b/src/piklab-test/checksum/Makefile.am index 865461a..984dca6 100644 --- a/src/piklab-test/checksum/Makefile.am +++ b/src/piklab-test/checksum/Makefile.am @@ -13,6 +13,6 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \ $(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la checksum_check_DEPENDENCIES = $(OBJ) -checksum_check_LDADD = $(OBJ) $(LIB_KIO) +checksum_check_LDADD = $(OBJ) $(LIB_TDEIO) checksum_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) checksum_check_SOURCES = checksum_check.cpp diff --git a/src/piklab-test/generators/Makefile.am b/src/piklab-test/generators/Makefile.am index 382ec5e..d7495cb 100644 --- a/src/piklab-test/generators/Makefile.am +++ b/src/piklab-test/generators/Makefile.am @@ -16,16 +16,16 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \ $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.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) -ltdetexteditor +gputils_config_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_QT) +gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor +gputils_template_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_QT) +gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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) -ltdetexteditor +sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_TDEIO) $(LIB_QT) +sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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 7453bc3..0f7b121 100644 --- a/src/piklab-test/misc/Makefile.am +++ b/src/piklab-test/misc/Makefile.am @@ -5,6 +5,6 @@ noinst_PROGRAMS = misc_check OBJ = $(top_builddir)/src/piklab-test/base/libtest.la $(top_builddir)/src/common/cli/libcli.la \ $(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) -ltdetexteditor +misc_check_LDADD = $(OBJ) $(LIB_TDEIO) +misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -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 1f5fffb..36c27c5 100644 --- a/src/piklab-test/save_load_memory/Makefile.am +++ b/src/piklab-test/save_load_memory/Makefile.am @@ -13,6 +13,6 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \ $(top_builddir)/src/devices/mem24/xml_data/libmem24xml.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) -ltdetexteditor +save_load_memory_check_LDADD = $(OBJ) $(LIB_TDEIO) +save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor save_load_memory_check_SOURCES = save_load_memory_check.cpp diff --git a/src/piklab/Makefile.am b/src/piklab/Makefile.am index 9fc4f84..5925561 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) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_KIO) +piklab_LDADD = $(OBJS) -ltdetexteditor $(LIBUSB_LIBS) $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TDEIO) piklab_DEPENDENCIES = $(OBJS) -piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) +piklab_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) piklab_SOURCES = main.cpp -- cgit v1.2.3