diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:34 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:34 -0600 |
| commit | c1501726ccea0c6ec2bc925f3dfc74f9626ff328 (patch) | |
| tree | f700ca388534ccc04b1114faaab5dc6926914df3 | |
| parent | bbc896984775997f13ea8a39f0d808da1a57d8bf (diff) | |
| download | kbookreader-c1501726ccea0c6ec2bc925f3dfc74f9626ff328.tar.gz kbookreader-c1501726ccea0c6ec2bc925f3dfc74f9626ff328.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | src/README | 2 | ||||
| -rw-r--r-- | src/bookreader.cpp | 8 | ||||
| -rw-r--r-- | src/settings.kcfgc | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8dc59c6..40b9ae6 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 ]) @@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html them more maintainable. For more details, consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html +http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html * With KParts, you can embed other kde components in your program, or make your program embeddable in other apps. For example, the kmplayer kpart can be called to play videos diff --git a/src/bookreader.cpp b/src/bookreader.cpp index 55c2f10..3920ef4 100644 --- a/src/bookreader.cpp +++ b/src/bookreader.cpp @@ -20,12 +20,12 @@ #include <kaccel.h> #include <kaction.h> #include <kcharsets.h> -#include <kconfig.h> -#include <kconfigdialog.h> +#include <tdeconfig.h> +#include <tdeconfigdialog.h> #include <kdebug.h> #include <tdeversion.h> #include <kencodingfiledialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kinputdialog.h> #include <kiconloader.h> @@ -41,7 +41,7 @@ #include <kurl.h> #include <kurldrag.h> #include <kurlrequesterdlg.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqdragobject.h> #include <tqpainter.h> #include <tqpaintdevicemetrics.h> diff --git a/src/settings.kcfgc b/src/settings.kcfgc index 2f6554f..4043e55 100644 --- a/src/settings.kcfgc +++ b/src/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=bookreader.kcfg ClassName=Settings Singleton=true |