diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:15 -0600 |
| commit | 542b8ae147236441cc55faf20f8af3ff3002ae61 (patch) | |
| tree | 410b10619504acdd8f8618940968528a3b45d97c | |
| parent | 3cbdc7886d184f106213feae7ebfb1a4015c7db0 (diff) | |
| download | potracegui-542b8ae147236441cc55faf20f8af3ff3002ae61.tar.gz potracegui-542b8ae147236441cc55faf20f8af3ff3002ae61.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | src/mainwidget.cpp | 4 | ||||
| -rw-r--r-- | src/potracegui.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 62ba0a9..6e01d00 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -590,7 +590,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], [XMLLINT=""]) @@ -1741,7 +1741,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 @@ -2037,7 +2037,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") @@ -2047,7 +2047,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/src/mainwidget.cpp b/src/mainwidget.cpp index 6a624a4..7762784 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -34,9 +34,9 @@ #include <tqglobal.h> #include <kurldrag.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kimageio.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <knuminput.h> #include <kcombobox.h> diff --git a/src/potracegui.cpp b/src/potracegui.cpp index cff5df2..54565a6 100644 --- a/src/potracegui.cpp +++ b/src/potracegui.cpp @@ -33,7 +33,7 @@ #include <kstdaccel.h> #include <kaction.h> #include <kstdaction.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kimageio.h> #include <kkeydialog.h> #include <kedittoolbar.h> |