From ac0ec6a50292929ffe812e4a79604cbd9a7e63fb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:14:00 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 26 +++++++++++++------------- configure.in.in | 2 +- src/Makefile.am | 2 +- src/configdialog.cpp | 2 +- src/entryview.cpp | 4 ++-- src/entryview.h | 2 +- src/fetchdialog.cpp | 2 +- src/filterdialog.cpp | 2 +- src/gui/lineedit.cpp | 2 +- src/gui/previewdialog.cpp | 2 +- src/mainwindow.cpp | 4 ++-- src/reportdialog.cpp | 4 ++-- src/viewstack.cpp | 2 +- xslt/entry-templates/Video.xsl | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 05fd358..3dfd15e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2080,16 +2080,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") @@ -2097,13 +2097,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)") @@ -2552,7 +2552,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 @@ -3494,7 +3494,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/configure.in.in b/configure.in.in index 44d87e6..8283d0d 100644 --- a/configure.in.in +++ b/configure.in.in @@ -341,7 +341,7 @@ AC_LANG_RESTORE if test x$kcal = xyes; then AC_DEFINE(HAVE_KCAL, 1, [Define to 1 if you have libkcal]) - KCAL_LIBS="-lkcal -lkresources" + KCAL_LIBS="-lkcal -ltderesources" else KCAL_LIBS= fi diff --git a/src/Makefile.am b/src/Makefile.am index be63808..ce732e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -122,7 +122,7 @@ KDE_OPTIONS = noautodist CLEANFILES = *~ *.loT # the library search path. -tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) uidir = $(kde_datadir)/tellico ui_DATA = tellicoui.rc diff --git a/src/configdialog.cpp b/src/configdialog.cpp index a9c6478..8d60942 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/entryview.cpp b/src/entryview.cpp index 93539cb..ddbdfb8 100644 --- a/src/entryview.cpp +++ b/src/entryview.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -253,7 +253,7 @@ void EntryView::setXSLTFile(const TQString& file_) { return; } - // now, have to recreate images and refresh khtml cache + // now, have to recreate images and refresh tdehtml cache resetColors(); } diff --git a/src/entryview.h b/src/entryview.h index 1a170c3..f105545 100644 --- a/src/entryview.h +++ b/src/entryview.h @@ -19,7 +19,7 @@ class KTempFile; #include "datavectors.h" -#include +#include #include diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index b51d0be..7244fcd 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/filterdialog.cpp b/src/filterdialog.cpp index 4ab54b4..559ac48 100644 --- a/src/filterdialog.cpp +++ b/src/filterdialog.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp index 1936795..db77b29 100644 --- a/src/gui/lineedit.cpp +++ b/src/gui/lineedit.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/src/gui/previewdialog.cpp b/src/gui/previewdialog.cpp index a875382..ea5a8f2 100644 --- a/src/gui/previewdialog.cpp +++ b/src/gui/previewdialog.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include using Tellico::GUI::PreviewDialog; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 18d7738..5737256 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include @@ -1707,7 +1707,7 @@ void MainWindow::doPrint(const TQString& html_) { // the problem with doing my own layout is that the text gets truncated, both at the // top and at the bottom. Even adding the overlap parameter, there were problems. // KHTMLView takes care of that with a truncatedAt() parameter, but that's hidden in -// the khtml::render_root class. So for now, just use the KHTMLView::print() method. +// the tdehtml::render_root class. So for now, just use the KHTMLView::print() method. #if 1 w.view()->print(); #else diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index f47ed50..421488d 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -25,8 +25,8 @@ #include "core/tellico_config.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/viewstack.cpp b/src/viewstack.cpp index 5af9e23..45632af 100644 --- a/src/viewstack.cpp +++ b/src/viewstack.cpp @@ -17,7 +17,7 @@ #include "tellico_debug.h" #include "imagefactory.h" -#include +#include #include #include diff --git a/xslt/entry-templates/Video.xsl b/xslt/entry-templates/Video.xsl index c74e88e..5870efa 100644 --- a/xslt/entry-templates/Video.xsl +++ b/xslt/entry-templates/Video.xsl @@ -125,7 +125,7 @@ background: ; text-align: center; } - /* there seems to be a khtml bug, in 3.4.x at least, repeat-x doesn't + /* there seems to be a tdehtml bug, in 3.4.x at least, repeat-x doesn't work on the tr element, so have to put it on the th element */ tr.category th { background-image: url();