diff options
| -rw-r--r-- | acinclude.m4 | 40 | ||||
| -rw-r--r-- | aclocal.m4 | 26 | ||||
| -rw-r--r-- | adept/adept/commitprogress.h | 2 | ||||
| -rw-r--r-- | adept/adept/dpkgpm-gui.cpp | 2 | ||||
| -rw-r--r-- | adept/batch/app.cpp | 2 | ||||
| -rw-r--r-- | adept/batch/app.h | 2 | ||||
| -rw-r--r-- | adept/installer/app.cpp | 2 | ||||
| -rw-r--r-- | adept/installer/app.h | 2 | ||||
| -rw-r--r-- | adept/libadept/commitprogress.h | 2 | ||||
| -rw-r--r-- | adept/libadept/dpkgpm-gui.cpp | 2 | ||||
| -rw-r--r-- | adept/manager/app.cpp | 2 | ||||
| -rw-r--r-- | adept/manager/app.h | 2 | ||||
| -rw-r--r-- | adept/updater/app.cpp | 2 | ||||
| -rw-r--r-- | adept/updater/app.h | 2 |
14 files changed, 45 insertions, 45 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 65d668b..d3e728c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2268,16 +2268,16 @@ if test $kde_qtver = 4; 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") @@ -2294,16 +2294,16 @@ elif 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") @@ -2311,13 +2311,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)") @@ -2771,7 +2771,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 @@ -3814,7 +3814,7 @@ LIBTOOL_SHELL="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) @@ -2087,16 +2087,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") @@ -2104,13 +2104,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)") @@ -2559,7 +2559,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 @@ -3501,7 +3501,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/adept/adept/commitprogress.h b/adept/adept/commitprogress.h index 12fdfd0..9e2aa30 100644 --- a/adept/adept/commitprogress.h +++ b/adept/adept/commitprogress.h @@ -4,7 +4,7 @@ #include <kde_terminal_interface.h> #include <adept/dpkgpm-gui.h> #include <adept/commitprogressui.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #ifndef EPT_COMMITPROGRESS_H #define EPT_COMMITPROGRESS_H diff --git a/adept/adept/dpkgpm-gui.cpp b/adept/adept/dpkgpm-gui.cpp index 5bf3d48..300c63b 100644 --- a/adept/adept/dpkgpm-gui.cpp +++ b/adept/adept/dpkgpm-gui.cpp @@ -10,7 +10,7 @@ #include <kapplication.h> #include <klistbox.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> diff --git a/adept/batch/app.cpp b/adept/batch/app.cpp index 087f818..2577b9c 100644 --- a/adept/batch/app.cpp +++ b/adept/batch/app.cpp @@ -11,7 +11,7 @@ #include <kactionclasses.h> #include <kapplication.h> #include <kdebug.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <ktrader.h> #include <klibloader.h> #include <kstatusbar.h> diff --git a/adept/batch/app.h b/adept/batch/app.h index ede6e36..7c0a7ac 100644 --- a/adept/batch/app.h +++ b/adept/batch/app.h @@ -3,7 +3,7 @@ #define APP_H #include <kmainwindow.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kactionclasses.h> #include <kcmdlineargs.h> #include <apt-front/cache/observer.h> diff --git a/adept/installer/app.cpp b/adept/installer/app.cpp index 8ab7c48..809e762 100644 --- a/adept/installer/app.cpp +++ b/adept/installer/app.cpp @@ -12,7 +12,7 @@ #include <kactionclasses.h> #include <kapplication.h> #include <kdebug.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <ktrader.h> #include <klibloader.h> #include <kstatusbar.h> diff --git a/adept/installer/app.h b/adept/installer/app.h index 2810432..b344e4a 100644 --- a/adept/installer/app.h +++ b/adept/installer/app.h @@ -3,7 +3,7 @@ #define TESTUI_APP_H #include <kmainwindow.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kactionclasses.h> #include <apt-front/cache/observer.h> #include <apt-front/cache/component/state.h> diff --git a/adept/libadept/commitprogress.h b/adept/libadept/commitprogress.h index 12fdfd0..9e2aa30 100644 --- a/adept/libadept/commitprogress.h +++ b/adept/libadept/commitprogress.h @@ -4,7 +4,7 @@ #include <kde_terminal_interface.h> #include <adept/dpkgpm-gui.h> #include <adept/commitprogressui.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #ifndef EPT_COMMITPROGRESS_H #define EPT_COMMITPROGRESS_H diff --git a/adept/libadept/dpkgpm-gui.cpp b/adept/libadept/dpkgpm-gui.cpp index 5bf3d48..300c63b 100644 --- a/adept/libadept/dpkgpm-gui.cpp +++ b/adept/libadept/dpkgpm-gui.cpp @@ -10,7 +10,7 @@ #include <kapplication.h> #include <klistbox.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> diff --git a/adept/manager/app.cpp b/adept/manager/app.cpp index 14b3c95..f1330d2 100644 --- a/adept/manager/app.cpp +++ b/adept/manager/app.cpp @@ -10,7 +10,7 @@ #include <kactionclasses.h> #include <kapplication.h> #include <kdebug.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kstatusbar.h> // bleeeh diff --git a/adept/manager/app.h b/adept/manager/app.h index 934007a..6a385b6 100644 --- a/adept/manager/app.h +++ b/adept/manager/app.h @@ -3,7 +3,7 @@ #define TESTUI_APP_H #include <kmainwindow.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kactionclasses.h> #include <apt-front/cache/observer.h> #include <apt-front/cache/component/state.h> diff --git a/adept/updater/app.cpp b/adept/updater/app.cpp index 000b950..58abdb0 100644 --- a/adept/updater/app.cpp +++ b/adept/updater/app.cpp @@ -11,7 +11,7 @@ #include <kactionclasses.h> #include <kapplication.h> #include <kdebug.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <ktrader.h> #include <klibloader.h> #include <kstatusbar.h> diff --git a/adept/updater/app.h b/adept/updater/app.h index 28d0f26..2935e2f 100644 --- a/adept/updater/app.h +++ b/adept/updater/app.h @@ -3,7 +3,7 @@ #define TESTUI_APP_H #include <kmainwindow.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kactionclasses.h> #include <apt-front/cache/observer.h> #include <apt-front/cache/component/state.h> |