From d2107b329f3eadbd4c193a21704fa6d4eedc0ed0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:12:36 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 26 +++++++++++++------------- aclocal.m4 | 26 +++++++++++++------------- apps/ktcachecheck/Makefile.am | 2 +- apps/ktorrent/Makefile.am | 2 +- apps/ktorrent/README | 2 +- apps/ktorrent/newui/dmainwindow.h | 2 +- apps/kttorinfo/Makefile.am | 2 +- apps/ktupnptest/Makefile.am | 2 +- libktorrent/interfaces/plugin.h | 2 +- libktorrent/pluginmanager.cpp | 2 +- plugins/search/htmlpart.cpp | 4 ++-- plugins/search/htmlpart.h | 2 +- plugins/search/searchwidget.cpp | 4 ++-- translations/lt/messages/ktorrent.po | 2 +- utests/Makefile.am | 2 +- 15 files changed, 41 insertions(+), 41 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d6a7783..235078b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2099,16 +2099,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2116,13 +2116,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2571,7 +2571,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3514,7 +3514,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/aclocal.m4 b/aclocal.m4 index 6f0c1f0..91fc07e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2111,16 +2111,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2128,13 +2128,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") else AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") @@ -2583,7 +2583,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3526,7 +3526,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/apps/ktcachecheck/Makefile.am b/apps/ktcachecheck/Makefile.am index 45b8aaa..f6c2a80 100644 --- a/apps/ktcachecheck/Makefile.am +++ b/apps/ktcachecheck/Makefile.am @@ -5,7 +5,7 @@ bin_PROGRAMS = ktcachecheck ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \ multicachechecker.cpp -ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \ $(LIB_KFILE) $(LIB_KIO) noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am index f3a904c..28c1073 100644 --- a/apps/ktorrent/Makefile.am +++ b/apps/ktorrent/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/ $(all_includes) # the library search path. -ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \ diff --git a/apps/ktorrent/README b/apps/ktorrent/README index 69e9ac5..f7d3506 100644 --- a/apps/ktorrent/README +++ b/apps/ktorrent/README @@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html diff --git a/apps/ktorrent/newui/dmainwindow.h b/apps/ktorrent/newui/dmainwindow.h index 3ebcddb..ab98207 100644 --- a/apps/ktorrent/newui/dmainwindow.h +++ b/apps/ktorrent/newui/dmainwindow.h @@ -21,7 +21,7 @@ #define DMAINWINDOW_H #include -#include +#include #include "ddockwindow.h" diff --git a/apps/kttorinfo/Makefile.am b/apps/kttorinfo/Makefile.am index dcb2cee..d85426e 100644 --- a/apps/kttorinfo/Makefile.am +++ b/apps/kttorinfo/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO bin_PROGRAMS = kttorinfo kttorinfo_SOURCES = main.cpp -kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \ $(LIB_KIO) diff --git a/apps/ktupnptest/Makefile.am b/apps/ktupnptest/Makefile.am index 08fb678..ba619b5 100644 --- a/apps/ktupnptest/Makefile.am +++ b/apps/ktupnptest/Makefile.am @@ -5,6 +5,6 @@ bin_PROGRAMS = ktupnptest ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \ ../../libktorrent/libktorrent.la $(LIB_KIO) -ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = upnptestapp.h KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/libktorrent/interfaces/plugin.h b/libktorrent/interfaces/plugin.h index 64829dc..c3e3f90 100644 --- a/libktorrent/interfaces/plugin.h +++ b/libktorrent/interfaces/plugin.h @@ -21,7 +21,7 @@ #define KTPLUGIN_H #include -#include +#include namespace bt { diff --git a/libktorrent/pluginmanager.cpp b/libktorrent/pluginmanager.cpp index dcd4749..2d3fe55 100644 --- a/libktorrent/pluginmanager.cpp +++ b/libktorrent/pluginmanager.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include #include -#include +#include #include #include #include diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp index ffaeb5d..2b63048 100644 --- a/plugins/search/htmlpart.cpp +++ b/plugins/search/htmlpart.cpp @@ -26,9 +26,9 @@ #include #include #include -#include +#include #include -#include +#include #include "htmlpart.h" using namespace bt; diff --git a/plugins/search/htmlpart.h b/plugins/search/htmlpart.h index f4a3454..b1b9273 100644 --- a/plugins/search/htmlpart.h +++ b/plugins/search/htmlpart.h @@ -20,7 +20,7 @@ #ifndef HTMLPART_H #define HTMLPART_H -#include +#include namespace TDEIO { diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index f0fefe0..b5008b8 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -20,7 +20,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/translations/lt/messages/ktorrent.po b/translations/lt/messages/ktorrent.po index 0ad6566..b3b5b96 100644 --- a/translations/lt/messages/ktorrent.po +++ b/translations/lt/messages/ktorrent.po @@ -185,7 +185,7 @@ msgstr "Pasirinkite bylą" #, fuzzy msgid "Choose a filename to save under" msgstr "" -"#-#-#-#-# ktexteditor_insertfile.po (ktexteditor_insertfile) #-#-#-#-#\n" +"#-#-#-#-# tdetexteditor_insertfile.po (tdetexteditor_insertfile) #-#-#-#-#\n" "Pasirinkite bylą įterpimui\n" "#-#-#-#-# katepart.po (katepart) #-#-#-#-#\n" "Pasirinkite įterpiamą bylą" diff --git a/utests/Makefile.am b/utests/Makefile.am index 8af9fa1..0de64c8 100644 --- a/utests/Makefile.am +++ b/utests/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \ upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h bin_PROGRAMS = ktutester -ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \ upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \ rc4test.cpp difflehellmantest.cpp