diff options
-rw-r--r-- | acinclude.m4 | 120 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | configure.in.in | 2 | ||||
-rw-r--r-- | src/app/bookmarkviewcontroller.cpp | 2 | ||||
-rw-r--r-- | src/app/configdialog.cpp | 2 | ||||
-rw-r--r-- | src/app/history.cpp | 2 | ||||
-rw-r--r-- | src/app/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/app/metaedit.cpp | 2 | ||||
-rw-r--r-- | src/doc/gwenview.1 | 2 | ||||
-rw-r--r-- | src/gvcore/cache.cpp | 2 | ||||
-rw-r--r-- | src/gvcore/deletedialog.cpp | 2 | ||||
-rw-r--r-- | src/gvcore/fileopobject.cpp | 2 | ||||
-rw-r--r-- | src/gvcore/imagesavedialog.cpp | 2 | ||||
-rw-r--r-- | src/gvcore/imageview.cpp | 2 | ||||
-rw-r--r-- | src/gvcore/jpegformattype.cpp | 2 | ||||
-rw-r--r-- | src/gvcore/jpegformattype.h | 2 | ||||
-rw-r--r-- | src/gvcore/qxcfi.cpp | 2 | ||||
-rw-r--r-- | src/gvdirpart/gvdirpart.cpp | 2 | ||||
-rw-r--r-- | src/imageutils/imageutils.cpp | 2 | ||||
-rw-r--r-- | src/imageutils/scale.cpp | 2 | ||||
-rw-r--r-- | src/spec/gwenview-RH.spec | 4 | ||||
-rw-r--r-- | src/spec/gwenview-mdk.spec | 4 |
22 files changed, 83 insertions, 83 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ffaf0b1..ce4327b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1796,8 +1796,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1815,7 +1815,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1830,7 +1830,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -3490,9 +3490,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include <stdio.h> @@ -3500,26 +3500,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -4544,7 +4544,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4934,7 +4934,7 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], @@ -4981,9 +4981,9 @@ AC_DEFUN([KDE_SET_PREFIX], kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5649,7 +5649,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5669,7 +5669,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5906,9 +5906,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/configure.in b/configure.in index 48a4e7d..5c616ae 100644 --- a/configure.in +++ b/configure.in @@ -102,7 +102,7 @@ fi # AM_PROG_AS -# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/ +# MMX test duped from tdelibs/tdefx - it should be probably moved to admin/ dnl ----------------------------------------------------- dnl IA32 checks dnl ----------------------------------------------------- diff --git a/configure.in.in b/configure.in.in index 190afeb..f5e959c 100644 --- a/configure.in.in +++ b/configure.in.in @@ -35,7 +35,7 @@ fi # AM_PROG_AS -# MMX test duped from kdelibs/tdefx - it should be probably moved to admin/ +# MMX test duped from tdelibs/tdefx - it should be probably moved to admin/ dnl ----------------------------------------------------- dnl IA32 checks dnl ----------------------------------------------------- diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp index 7bf9cbd..b40f70e 100644 --- a/src/app/bookmarkviewcontroller.cpp +++ b/src/app/bookmarkviewcontroller.cpp @@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kactioncollection.h> #include <kbookmarkmanager.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kiconloader.h> #include <klistview.h> #include <klocale.h> diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp index 2940167..0fb33df 100644 --- a/src/app/configdialog.cpp +++ b/src/app/configdialog.cpp @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // KDE #include <kcolorbutton.h> #include <kconfigdialogmanager.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdirsize.h> #include <kfiledialog.h> #include <kiconloader.h> diff --git a/src/app/history.cpp b/src/app/history.cpp index 9c38ae7..e8781f3 100644 --- a/src/app/history.cpp +++ b/src/app/history.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kaction.h> #include <klocale.h> #include <kpopupmenu.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kstdaccel.h> #include <kstdguiitem.h> diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 04b4c02..1464a09 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kconfig.h> #include <kcursor.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdockwidget.h> #include <kedittoolbar.h> #include <kfiledialog.h> diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp index 8e0897d..3fa9e19 100644 --- a/src/app/metaedit.cpp +++ b/src/app/metaedit.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tqfileinfo.h> // KDE -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> // Local diff --git a/src/doc/gwenview.1 b/src/doc/gwenview.1 index e39b41c..e44918e 100644 --- a/src/doc/gwenview.1 +++ b/src/doc/gwenview.1 @@ -9,7 +9,7 @@ Gwenview is an image viewer for KDE. It features a folder tree window and a file .PP Image loading is handled by the Qt library, so Gwenview supports all image formats your Qt installation supports. Gwenview correctly displays images with an alpha channel. .PP -Gwenview supports the displaying and editing of EXIF comments, if the necessary JPEG kfile\-plugin is installed. This comes as part of the kdegraphics package. Lossless JPEG transforms are also supported. +Gwenview supports the displaying and editing of EXIF comments, if the necessary JPEG kfile\-plugin is installed. This comes as part of the tdegraphics package. Lossless JPEG transforms are also supported. .SH OPTIONS .SS Arguments: .TP diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp index f7508cb..448d8f6 100644 --- a/src/gvcore/cache.cpp +++ b/src/gvcore/cache.cpp @@ -26,7 +26,7 @@ Copyright 2000-2004 Aurélien Gâteau // KDE #include <kconfig.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <ksharedptr.h> #include <kstaticdeleter.h> #include <kio/global.h> diff --git a/src/gvcore/deletedialog.cpp b/src/gvcore/deletedialog.cpp index 1a998a3..3d6308b 100644 --- a/src/gvcore/deletedialog.cpp +++ b/src/gvcore/deletedialog.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdialogbase.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp index 28fc78e..e72d192 100644 --- a/src/gvcore/fileopobject.cpp +++ b/src/gvcore/fileopobject.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <tqwidget.h> // KDE -#include <kdeversion.h> +#include <tdeversion.h> #include <kfiledialog.h> #include <kfilefiltercombo.h> #include <kglobalsettings.h> diff --git a/src/gvcore/imagesavedialog.cpp b/src/gvcore/imagesavedialog.cpp index db1e325..7831830 100644 --- a/src/gvcore/imagesavedialog.cpp +++ b/src/gvcore/imagesavedialog.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // KDE includes #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kfilefiltercombo.h> #include <kimageio.h> #include <klocale.h> diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp index 16575ef..a6c5b9f 100644 --- a/src/gvcore/imageview.cpp +++ b/src/gvcore/imageview.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <kaction.h> #include <kconfig.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <kstandarddirs.h> #include <kstdaction.h> diff --git a/src/gvcore/jpegformattype.cpp b/src/gvcore/jpegformattype.cpp index 97ad532..749ffb8 100644 --- a/src/gvcore/jpegformattype.cpp +++ b/src/gvcore/jpegformattype.cpp @@ -1,4 +1,4 @@ -/* This file is based on kdelibs-3.2.0/khtml/misc/loader_jpeg.cpp. Original +/* This file is based on tdelibs-3.2.0/khtml/misc/loader_jpeg.cpp. Original * copyright follows. */ /* diff --git a/src/gvcore/jpegformattype.h b/src/gvcore/jpegformattype.h index 3aeed7a..afb9e85 100644 --- a/src/gvcore/jpegformattype.h +++ b/src/gvcore/jpegformattype.h @@ -1,4 +1,4 @@ -/* This file is based on kdelibs-3.2.0/khtml/misc/loader_jpeg.h. Original +/* This file is based on tdelibs-3.2.0/khtml/misc/loader_jpeg.h. Original * copyright follows. */ /* diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp index 89ef317..9fb146a 100644 --- a/src/gvcore/qxcfi.cpp +++ b/src/gvcore/qxcfi.cpp @@ -20,7 +20,7 @@ */ #include <tqiodevice.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <stdlib.h> #include "qxcfi.h" diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp index 3fa0800..4745bfe 100644 --- a/src/gvdirpart/gvdirpart.cpp +++ b/src/gvdirpart/gvdirpart.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. #include <tqvaluelist.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaction.h> #include <kicontheme.h> #include <kiconloader.h> diff --git a/src/imageutils/imageutils.cpp b/src/imageutils/imageutils.cpp index 2ec1209..289d24f 100644 --- a/src/imageutils/imageutils.cpp +++ b/src/imageutils/imageutils.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // KDE #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kglobal.h> // Local diff --git a/src/imageutils/scale.cpp b/src/imageutils/scale.cpp index 0d78886..c8a70a7 100644 --- a/src/imageutils/scale.cpp +++ b/src/imageutils/scale.cpp @@ -73,7 +73,7 @@ #include <tqimage.h> #include <tqcolor.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kcpuinfo.h> #include <string.h> diff --git a/src/spec/gwenview-RH.spec b/src/spec/gwenview-RH.spec index 1b664db..f81e17b 100644 --- a/src/spec/gwenview-RH.spec +++ b/src/spec/gwenview-RH.spec @@ -9,8 +9,8 @@ Group: Amusements/Graphics Source: http://prdownloads.sourceforge.net/gwenview/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-root Url: http://gwenview.sourceforge.net/home/ -Requires: libpng, kdebase >= 3.0 -BuildRequires: libpng-devel, kdelibs-devel, arts-devel, libjpeg-devel +Requires: libpng, tdebase >= 3.0 +BuildRequires: libpng-devel, tdelibs-devel, arts-devel, libjpeg-devel BuildRequires: XFree86-devel, zlib-devel, qt-devel >= 3.0.2 %description diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec index b57a174..34bd4f4 100644 --- a/src/spec/gwenview-mdk.spec +++ b/src/spec/gwenview-mdk.spec @@ -35,9 +35,9 @@ URL: http://gwenview.sourceforge.net BuildRoot: %_tmppath/%{name}-%{version} # added automake1.7 requirement to patch Makefile(s).am %if %build_kipi -BuildRequires: kdelibs-devel automake1.7 X11-devel %{kipireq} +BuildRequires: tdelibs-devel automake1.7 X11-devel %{kipireq} %else -BuildRequires: kdelibs-devel automake1.7 X11-devel +BuildRequires: tdelibs-devel automake1.7 X11-devel %endif |