From d1a7b536726f040cfa834fb2eedb690d0bf2f1fb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:52:16 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 8 ++++---- k9author/k9import.cpp | 2 +- libk9copy/k9burndvd.cpp | 2 +- libk9copy/k9mp4enc.cpp | 2 +- src/Makefile.am | 4 ++-- src/k9main.cpp | 6 +++--- src/k9main.h | 4 ++-- src/k9settings.h | 2 +- src/{kconfigdlg.cpp => tdeconfigdlg.cpp} | 2 +- src/{kconfigdlg.h => tdeconfigdlg.h} | 0 10 files changed, 16 insertions(+), 16 deletions(-) rename src/{kconfigdlg.cpp => tdeconfigdlg.cpp} (99%) rename src/{kconfigdlg.h => tdeconfigdlg.h} (100%) diff --git a/acinclude.m4 b/acinclude.m4 index ccfe24d..950f4ca 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -572,7 +572,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""]) @@ -1733,7 +1733,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2029,7 +2029,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2039,7 +2039,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/k9author/k9import.cpp b/k9author/k9import.cpp index 654ce5d..6852e3b 100644 --- a/k9author/k9import.cpp +++ b/k9author/k9import.cpp @@ -21,7 +21,7 @@ #include "k9config.h" #include "k9burndvd.h" #include -#include +#include #include #include #include diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp index 3975895..45b8597 100644 --- a/libk9copy/k9burndvd.cpp +++ b/libk9copy/k9burndvd.cpp @@ -23,7 +23,7 @@ #include "k9tools.h" #include #include -#include +#include #include #include #include diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp index 7f33e97..a8a74b9 100644 --- a/libk9copy/k9mp4enc.cpp +++ b/libk9copy/k9mp4enc.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Makefile.am b/src/Makefile.am index e6cf850..d7874f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \ noinst_HEADERS = k9copy.h k9glwidget.h k9langselect.h k9main.h \ k9mencodercmdgen.h k9mp4title.h k9play.h k9playbackoptions.h k9prefauthor.h k9prefdvd.h \ k9prefmencoder.h k9prefmpeg4.h k9prefpreview.h k9redirect.h k9settings.h k9titlefactor.h \ - k9updatefactor.h kconfigdlg.h + k9updatefactor.h tdeconfigdlg.h # let automoc handle all of the meta source files (moc) METASOURCES = AUTO @@ -27,7 +27,7 @@ k9copy_SOURCES = configDlg.ui images.h k9copy.cpp k9copy.png k9glwidget.cpp \ k9langselect.cpp k9main.cpp k9mainw.ui k9mencodercmdgen.cpp k9mp4title.cpp k9play.cpp \ k9playbackoptions.cpp k9prefauthor.cpp k9prefdvd.cpp k9prefmencoder.cpp k9prefmpeg4.cpp \ k9prefpreview.cpp k9redirect.cpp k9settings.cpp k9titlefactor.cpp k9updatefactor.cpp \ - kconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ + tdeconfigdlg.cpp kviewmpeg2.cpp kviewmpeg2.h langselectw.ui main.cpp mencoderCmdGen.ui \ playbackoptionsw.ui prefAuthor.ui prefDVD.ui prefMPEG4.ui prefMencoder.ui prefpreview.ui \ titlefactor.ui viewmpeg2.ui k9copy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) diff --git a/src/k9main.cpp b/src/k9main.cpp index 1035e34..f10d15c 100644 --- a/src/k9main.cpp +++ b/src/k9main.cpp @@ -53,9 +53,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/k9main.h b/src/k9main.h index 0a75343..9c131e6 100644 --- a/src/k9main.h +++ b/src/k9main.h @@ -16,7 +16,7 @@ #include "k9cddrive.h" #include "images.h" #include "k9mainw.h" -#include "kconfigdlg.h" +#include "tdeconfigdlg.h" #include "k9playbackoptions.h" #include #include @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "k9copy.h" #include diff --git a/src/k9settings.h b/src/k9settings.h index 60ffb45..52d0d55 100644 --- a/src/k9settings.h +++ b/src/k9settings.h @@ -13,7 +13,7 @@ #define K9SETTINGS_H #include "k9common.h" -#include "kconfigdlg.h" +#include "tdeconfigdlg.h" #include "k9prefdvd.h" #include "k9prefmpeg4.h" #include "k9prefmencoder.h" diff --git a/src/kconfigdlg.cpp b/src/tdeconfigdlg.cpp similarity index 99% rename from src/kconfigdlg.cpp rename to src/tdeconfigdlg.cpp index f0a39bb..3f001f5 100644 --- a/src/kconfigdlg.cpp +++ b/src/tdeconfigdlg.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kconfigdlg.h" +#include "tdeconfigdlg.h" #include "kmessagebox.h" #include diff --git a/src/kconfigdlg.h b/src/tdeconfigdlg.h similarity index 100% rename from src/kconfigdlg.h rename to src/tdeconfigdlg.h