Additional k => tde renaming and fixes

r14.0.x
Slávek Banko 11 years ago
parent f9cfef2e1d
commit 6f09ff652a

@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEABC, "-ltdeabc")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-ltdednssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-ltdeio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-ltdeio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")

@ -1,5 +1,5 @@
#ifndef NOKDE_KLOCALE_H #ifndef NOKDE_TDELOCALE_H
#define NOKDE_KLOCALE_H #define NOKDE_TDELOCALE_H
#undef TDECORE_EXPORT #undef TDECORE_EXPORT
#define TDECORE_EXPORT #define TDECORE_EXPORT

@ -472,7 +472,7 @@ void LikeBack::endFetchingEmailFrom()
// m_process = 0; // m_process = 0;
// m_configureEmail->setEnabled(true); // 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") ); TDEConfig emailConf( TQString::fromLatin1("emaildefaults") );
// find out the default profile // find out the default profile

@ -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/mem24/xml_data/libmem24xml.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
piklab_coff_DEPENDENCIES = $(OBJ) piklab_coff_DEPENDENCIES = $(OBJ)
piklab_coff_LDADD = $(OBJ) $(LIB_KIO) piklab_coff_LDADD = $(OBJ) $(LIB_TDEIO)
piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor piklab_coff_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
piklab_coff_SOURCES = main.cpp piklab_coff_SOURCES = main.cpp

@ -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/mem24/xml_data/libmem24xml.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
piklab_hex_DEPENDENCIES = $(OBJ) piklab_hex_DEPENDENCIES = $(OBJ)
piklab_hex_LDADD = $(OBJ) $(LIB_KIO) piklab_hex_LDADD = $(OBJ) $(LIB_TDEIO)
piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor piklab_hex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
piklab_hex_SOURCES = main.cpp piklab_hex_SOURCES = main.cpp

@ -26,6 +26,6 @@ OBJ = $(top_builddir)/src/progs/list/libproglistnoui.la \
$(top_builddir)/src/devices/base/libdevicebase.la \ $(top_builddir)/src/devices/base/libdevicebase.la \
$(top_builddir)/src/common/common/libcommon.la $(top_builddir)/src/common/common/libcommon.la
piklab_prog_DEPENDENCIES = $(OBJ) piklab_prog_DEPENDENCIES = $(OBJ)
piklab_prog_LDADD = $(OBJ) $(LIB_KIO) $(LIBUSB_LIBS) $(LIBREADLINE_LIBS) 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_KIO) -ltdetexteditor 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 piklab_prog_SOURCES = cmdline.cpp cli_prog_manager.cpp cli_debug_manager.cpp cli_interactive.cpp

@ -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/mem24/xml_data/libmem24xml.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
checksum_check_DEPENDENCIES = $(OBJ) 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE)
checksum_check_SOURCES = checksum_check.cpp checksum_check_SOURCES = checksum_check.cpp

@ -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 $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
gputils_config_generator_check_DEPENDENCIES = $(OBJ) gputils_config_generator_check_DEPENDENCIES = $(OBJ)
gputils_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT) 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_KIO) -ltdetexteditor 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_config_generator_check_SOURCES = gputils_config_generator_check.cpp
gputils_template_generator_check_DEPENDENCIES = $(OBJ) gputils_template_generator_check_DEPENDENCIES = $(OBJ)
gputils_template_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT) 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_KIO) -ltdetexteditor 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 gputils_template_generator_check_SOURCES = gputils_template_generator_check.cpp
sdcc_config_generator_check_DEPENDENCIES = $(OBJ) sdcc_config_generator_check_DEPENDENCIES = $(OBJ)
sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT) 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_KIO) -ltdetexteditor 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 sdcc_config_generator_check_SOURCES = sdcc_config_generator_check.cpp

@ -5,6 +5,6 @@ noinst_PROGRAMS = misc_check
OBJ = $(top_builddir)/src/piklab-test/base/libtest.la $(top_builddir)/src/common/cli/libcli.la \ 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 $(top_builddir)/src/common/global/libglobal.la $(top_builddir)/src/common/common/libcommon.la
misc_check_DEPENDENCIES = $(OBJ) misc_check_DEPENDENCIES = $(OBJ)
misc_check_LDADD = $(OBJ) $(LIB_KIO) misc_check_LDADD = $(OBJ) $(LIB_TDEIO)
misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
misc_check_SOURCES = misc_check.cpp misc_check_SOURCES = misc_check.cpp

@ -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/mem24/xml_data/libmem24xml.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.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_DEPENDENCIES = $(OBJ)
save_load_memory_check_LDADD = $(OBJ) $(LIB_KIO) 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_KIO) -ltdetexteditor 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 save_load_memory_check_SOURCES = save_load_memory_check.cpp

@ -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/mem24/libmem24.la $(top_builddir)/src/devices/mem24/base/libmem24base.la \
$(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \ $(top_builddir)/src/devices/mem24/xml_data/libmem24xml.la \
$(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.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_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 piklab_SOURCES = main.cpp

Loading…
Cancel
Save