diff options
101 files changed, 220 insertions, 220 deletions
@@ -1,6 +1,6 @@ KOffice is based on KDE ( http://www.kde.org ) which is needed to run KOffice. -You need kdelibs and kdebase installed if you want to compile and run -KOffice. Look in the kdelibs sourcedir for the file COMPILING for help. Also +You need tdelibs and tdebase installed if you want to compile and run +KOffice. Look in the tdelibs sourcedir for the file COMPILING for help. Also look at the website as there are many helpfiles available. KOffice is a collection of office applications linked together by a common diff --git a/README.APPS b/README.APPS index ebdafae4f..7901ebbfe 100644 --- a/README.APPS +++ b/README.APPS @@ -9,7 +9,7 @@ are committed in the 1.5 branch will be forward ported to 1.6 at the time of the release. The real development will happen in trunk, and will eventually lead to -KOffice version 2.0, which will be based on Qt4 and kdelibs4. +KOffice version 2.0, which will be based on Qt4 and tdelibs4. Here is the list of applications and libraries that will be developed in the 1.6 cycle: diff --git a/acinclude.m4 b/acinclude.m4 index ffaf0b1ea..ce4327b18 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/autocorrect/Makefile.am b/autocorrect/Makefile.am index fde9d50b8..7003adc15 100644 --- a/autocorrect/Makefile.am +++ b/autocorrect/Makefile.am @@ -1,6 +1,6 @@ # (Is autocorrect.xml still used?) -# WARNING: Do not add any other language here - use kde-i18n/*/data/koffice/autocorrect for that. +# WARNING: Do not add any other language here - use tde-i18n/*/data/koffice/autocorrect for that. scripts_DATA = autocorrect.xml en_US.xml scriptsdir = $(kde_datadir)/koffice/autocorrect diff --git a/changes-1.4 b/changes-1.4 index 95ae5bcb7..a5a176721 100644 --- a/changes-1.4 +++ b/changes-1.4 @@ -84,7 +84,7 @@ kotext (shared by KWord and KPresenter): * Word completion with tooltip * Open links by clicking on them, use hand pointer, show link target in statusbar. * Tab/Shift+Tab for changing indentation in lists -* Rewritten spell-checking support (based on kspell2, the main reason for the kdelibs >= 3.3 requirement) +* Rewritten spell-checking support (based on kspell2, the main reason for the tdelibs >= 3.3 requirement) which is much faster and solves many problems (e.g. KOffice-1.3's hanging right-click-menu) * Improved autocorrection (better URL detection among other things) diff --git a/changes-1.5 b/changes-1.5 index 9ece0340c..0e3b9c78f 100644 --- a/changes-1.5 +++ b/changes-1.5 @@ -5,7 +5,7 @@ - Palettes now have a smart mode where they start floating on small screens and docked on larger screens - ToolBox is no longer duplicated for every view - - Accessibility: Allow speaking texts using the kdeaccessibility tools (KTTS). + - Accessibility: Allow speaking texts using the tdeaccessibility tools (KTTS). - Accessibility: Alt-F8 to set focus to any focusable widget. - Accessibility: F8 and Shift-F8 for mouseless splitter and dock widget sizing. diff --git a/configure.in b/configure.in index e5804415f..1ec137ef7 100644 --- a/configure.in +++ b/configure.in @@ -238,13 +238,13 @@ AC_MSG_CHECKING([for KDE version]) AC_LANG_SAVE AC_LANG_CPLUSPLUS -kdeversion_save_CXXFLAGS="$CXXFLAGS" -kdeversion_safe_LIBS="$LIBS" +tdeversion_save_CXXFLAGS="$CXXFLAGS" +tdeversion_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) #error KDE 3.2 #endif @@ -255,7 +255,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) #error KDE 3.3 #endif @@ -266,7 +266,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) #error KDE 3.4 #endif @@ -277,7 +277,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) #error KDE 3.5.x (x < 2) #endif @@ -286,8 +286,8 @@ AC_COMPILE_IFELSE([ , need_trinity51_compat="yes" ) -CXXFLAGS="$kdeversion_save_CXXFLAGS" -LIBS="$kdeversion_safe_LIBS" +CXXFLAGS="$tdeversion_save_CXXFLAGS" +LIBS="$tdeversion_safe_LIBS" AC_LANG_RESTORE if test "$need_trinity2_compat" = "yes"; then @@ -889,7 +889,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for MySQL libraries]) - mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + mysql_libdirs="$ac_mysql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir) if test -r $mysql_libdir/mysql/libmysqlclient.so; then MYSQL_LIBS=$mysql_libdir @@ -985,7 +985,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for PostgreSQL C API libraries]) - pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir) if test -r $pgsql_libdir/libpq.so; then PG_LIBDIR=$pgsql_libdir @@ -1065,7 +1065,7 @@ dnl libpqxx libraries dnl ======================================== if test "$compile_pgsql_plugin" = "yes"; then AC_MSG_CHECKING([for PostgreSQL C++ libraries]) - pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir) if test -r $pqxx_libdir/libpqxx.so; then PQXX_LIBDIR=$pqxx_libdir @@ -1837,7 +1837,7 @@ AC_CONFIG_FILES([ kexi/data/trinity4compat/Makefile ]) AC_CONFIG_FILES([ kexi/examples/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/factories/Makefile ]) -AC_CONFIG_FILES([ kexi/formeditor/kdevelop_plugin/Makefile ]) +AC_CONFIG_FILES([ kexi/formeditor/tdevelop_plugin/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/scripting/Makefile ]) AC_CONFIG_FILES([ kexi/formeditor/test/Makefile ]) AC_CONFIG_FILES([ kexi/kexidb/Makefile ]) @@ -2591,7 +2591,7 @@ fi if test -z "$LIBKSPELL2"; then echo "" - echo "You don't use kdelibs CVS (kspell2 not found). Spell-checking disabled." + echo "You don't use tdelibs CVS (kspell2 not found). Spell-checking disabled." echo "" all_tests=bad fi diff --git a/configure.in.in b/configure.in.in index 21699e044..7a788e3a3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -171,13 +171,13 @@ AC_MSG_CHECKING([for KDE version]) AC_LANG_SAVE AC_LANG_CPLUSPLUS -kdeversion_save_CXXFLAGS="$CXXFLAGS" -kdeversion_safe_LIBS="$LIBS" +tdeversion_save_CXXFLAGS="$CXXFLAGS" +tdeversion_safe_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 2, 90 ) ) #error KDE 3.2 #endif @@ -188,7 +188,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 3, 90 ) ) #error KDE 3.3 #endif @@ -199,7 +199,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) #error KDE 3.4 #endif @@ -210,7 +210,7 @@ AC_COMPILE_IFELSE([ ) AC_COMPILE_IFELSE([ -#include <kdeversion.h> +#include <tdeversion.h> #if ! ( KDE_IS_VERSION( 3, 5, 2 ) ) #error KDE 3.5.x (x < 2) #endif @@ -219,8 +219,8 @@ AC_COMPILE_IFELSE([ , need_trinity51_compat="yes" ) -CXXFLAGS="$kdeversion_save_CXXFLAGS" -LIBS="$kdeversion_safe_LIBS" +CXXFLAGS="$tdeversion_save_CXXFLAGS" +LIBS="$tdeversion_safe_LIBS" AC_LANG_RESTORE if test "$need_trinity2_compat" = "yes"; then diff --git a/doc/chalk/installation.docbook b/doc/chalk/installation.docbook index 4ec595d48..5d3a9afee 100644 --- a/doc/chalk/installation.docbook +++ b/doc/chalk/installation.docbook @@ -18,7 +18,7 @@ application --> <!-- List any special requirements for your application here. This should include: .Libraries or other software that is not included in tdesupport, -kdelibs, or kdebase. +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/doc/kchart/index.docbook b/doc/kchart/index.docbook index 3d9414f7c..ce67a0d86 100644 --- a/doc/kchart/index.docbook +++ b/doc/kchart/index.docbook @@ -54,7 +54,7 @@ components. <keywordset> <keyword>KDE</keyword> -<keyword>kdeutils</keyword> +<keyword>tdeutils</keyword> <keyword>Kchart</keyword> <keyword>chart</keyword> <keyword>graph</keyword> diff --git a/doc/kpresenter/a11y.docbook b/doc/kpresenter/a11y.docbook index 66f687e2d..67e302ede 100644 --- a/doc/kpresenter/a11y.docbook +++ b/doc/kpresenter/a11y.docbook @@ -16,13 +16,13 @@ for users with disabilities. Some of these features apply to &kde; as a whole an and some are specific to &kpresenter;.</para> <sect1 id="a11y-install"> -<title>Installing the <command>kdeaccessibility</command> Module</title> -<indexterm><primary>kdeaccessibility</primary></indexterm> +<title>Installing the <command>tdeaccessibility</command> Module</title> +<indexterm><primary>tdeaccessibility</primary></indexterm> <para> Most of the features described in this chapter are enabled by installing the -<command>kdeaccessibility</command> module. -The <command>kdeaccessibility</command> module is part of the &kde; project -<ulink url="http://www.kde.org">http://www.kde.org</ulink>. The <command>kdeaccessibility</command> +<command>tdeaccessibility</command> module. +The <command>tdeaccessibility</command> module is part of the &kde; project +<ulink url="http://www.kde.org">http://www.kde.org</ulink>. The <command>tdeaccessibility</command> package can be obtained from &kde-ftp;, the main ftp site of the &kde; project. </para> @@ -73,7 +73,7 @@ Move the screen with the arrow keys and press <keycap>&Esc;</keycap>. <sect2 id="a11y-kmagnifier"> <title>KMagnifier</title> <indexterm><primary>magnifier</primary></indexterm> -<para>The <command>kdeaccessibility</command> module includes a screen magnifier +<para>The <command>tdeaccessibility</command> module includes a screen magnifier application called <ulink url="help:kmag">KMagnifier</ulink>. If it is installed, you may run it from <menuchoice><guimenu>K-Button</guimenu><guimenuitem>Utilities</guimenuitem> @@ -85,7 +85,7 @@ If it is installed, you may run it from <title>Text-to-Speech</title> <indexterm><primary>Text-to-Speech</primary></indexterm> <indexterm><primary>TTS</primary></indexterm> -<para>The <command>kdeaccessibility</command> module includes a Text-to-Speech +<para>The <command>tdeaccessibility</command> module includes a Text-to-Speech component called KTTS. If KTTS is installed, you can configure &kpresenter; to speak the text that is under the mouse pointer or speak the text of each screen widget as it receives focus. Before using this feature, first configure diff --git a/doc/kspread/a11y.docbook b/doc/kspread/a11y.docbook index c7ceaee57..8e1a44183 100644 --- a/doc/kspread/a11y.docbook +++ b/doc/kspread/a11y.docbook @@ -16,13 +16,13 @@ for users with disabilities. Some of these features apply to &kde; as a whole an and some are specific to &kspread;.</para> <sect1 id="a11y-install"> -<title>Installing the <command>kdeaccessibility</command> Module</title> -<indexterm><primary>kdeaccessibility</primary></indexterm> +<title>Installing the <command>tdeaccessibility</command> Module</title> +<indexterm><primary>tdeaccessibility</primary></indexterm> <para> Most of the features described in this chapter are enabled by installing the -<command>kdeaccessibility</command> module. -The <command>kdeaccessibility</command> module is part of the &kde; project -<ulink url="http://www.kde.org">http://www.kde.org</ulink>. The <command>kdeaccessibility</command> +<command>tdeaccessibility</command> module. +The <command>tdeaccessibility</command> module is part of the &kde; project +<ulink url="http://www.kde.org">http://www.kde.org</ulink>. The <command>tdeaccessibility</command> package can be obtained from &kde-ftp;, the main ftp site of the &kde; project. </para> @@ -72,7 +72,7 @@ Move the screen with the arrow keys and press &Esc; to finish the move. <sect2 id="a11y-kmagnifier"> <title>&kmagnifier;</title> <indexterm><primary>magnifier</primary></indexterm> -<para>The <command>kdeaccessibility</command> module includes a screen magnifier +<para>The <command>tdeaccessibility</command> module includes a screen magnifier application called <ulink url="help:kmag">&kmagnifier;</ulink>. If it is installed, you can run it from <menuchoice><guimenu>K-Button</guimenu><guimenuitem>Utilities</guimenuitem> @@ -84,7 +84,7 @@ If it is installed, you can run it from <title>Text-to-Speech</title> <indexterm><primary>Text-to-Speech</primary></indexterm> <indexterm><primary>TTS</primary></indexterm> -<para>The <command>kdeaccessibility</command> module includes a Text-to-Speech +<para>The <command>tdeaccessibility</command> module includes a Text-to-Speech component called KTTS. If KTTS is installed, you can configure &kspread; to speak the text that is under the mouse pointer or speak the text of each screen widget as it receives focus. Before using this feature, first configure diff --git a/doc/kugar/index.docbook b/doc/kugar/index.docbook index cbe87b760..3efcf4365 100644 --- a/doc/kugar/index.docbook +++ b/doc/kugar/index.docbook @@ -65,7 +65,7 @@ <keywordset> <keyword>KDE</keyword> -<keyword>kdeutils</keyword> +<keyword>tdeutils</keyword> <keyword>kugar</keyword> <keyword>kudesigner</keyword> <keyword>report</keyword> diff --git a/doc/kword/a11y.docbook b/doc/kword/a11y.docbook index bcf95101a..73bd23cc3 100644 --- a/doc/kword/a11y.docbook +++ b/doc/kword/a11y.docbook @@ -16,13 +16,13 @@ for users with disabilities. Some of these features apply to &kde; as a whole an and some are specific to &kword;.</para> <sect1 id="a11y-install"> -<title>Installing the <command>kdeaccessibility</command> Module</title> -<indexterm><primary>kdeaccessibility</primary></indexterm> +<title>Installing the <command>tdeaccessibility</command> Module</title> +<indexterm><primary>tdeaccessibility</primary></indexterm> <para> Most of the features described in this chapter are enabled by installing the -<command>kdeaccessibility</command> module. -The <command>kdeaccessibility</command> module is part of the &kde; project -<ulink url="http://www.kde.org">http://www.kde.org</ulink>. The <command>kdeaccessibility</command> +<command>tdeaccessibility</command> module. +The <command>tdeaccessibility</command> module is part of the &kde; project +<ulink url="http://www.kde.org">http://www.kde.org</ulink>. The <command>tdeaccessibility</command> package can be obtained from &kde-ftp;, the main ftp site of the &kde; project. </para> @@ -72,7 +72,7 @@ Move the screen with the arrow keys and press &Esc; to finish the move. <sect2 id="a11y-kmagnifier"> <title>&kmagnifier;</title> <indexterm><primary>magnifier</primary></indexterm> -<para>The <command>kdeaccessibility</command> module includes a screen magnifier +<para>The <command>tdeaccessibility</command> module includes a screen magnifier application called <ulink url="help:kmag">&kmagnifier;</ulink>. If it is installed, you can run it from <menuchoice><guimenu>K-Button</guimenu><guimenuitem>Utilities</guimenuitem> @@ -84,7 +84,7 @@ If it is installed, you can run it from <title>Text-to-Speech</title> <indexterm><primary>Text-to-Speech</primary></indexterm> <indexterm><primary>TTS</primary></indexterm> -<para>The <command>kdeaccessibility</command> module includes a Text-to-Speech +<para>The <command>tdeaccessibility</command> module includes a Text-to-Speech component called KTTS. If KTTS is installed, you can configure &kword; to speak the text that is under the mouse pointer or speak the text of each screen widget as it receives focus. Before using this feature, first configure diff --git a/doc/kword/index.docbook b/doc/kword/index.docbook index 0c71b947d..dfc296e0d 100644 --- a/doc/kword/index.docbook +++ b/doc/kword/index.docbook @@ -813,8 +813,8 @@ url="http://www.trolltech.com">Trolltech</ulink>.</para> </listitem> <listitem> -<para>&kde; 3.3.0 libraries (kdelibs) and the &kde; 3.3.0 base package -(kdebase). These can be obtained from the <ulink +<para>&kde; 3.3.0 libraries (tdelibs) and the &kde; 3.3.0 base package +(tdebase). These can be obtained from the <ulink url="http://www.kde.org">&kde; web page.</ulink></para> <tip><para>While &koffice; will compile and run with any version of &kde; 3.3.0 or later, it is recommended that you compile and install &kde; 3.4 to take advantage of all the bug fixes that have occurred.</para> diff --git a/example/Makefile.am b/example/Makefile.am index 4b7474645..96799ae0a 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -22,7 +22,7 @@ kdelnk_DATA = example.desktop kdelnkdir = $(kde_appsdir)/Office # Note: for your application, the mime type should be defined in -# kdelibs CVS HEAD and a compatibility entry should be added in +# tdelibs CVS HEAD and a compatibility entry should be added in # the directory koffice/mimetypes/kde?? # where ?? is the version number of the last stable kde(libs) release. kdemime_DATA = x-vnd.kde.example.desktop diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc index 2118e3768..2194831a1 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cc +++ b/filters/chalk/gmagick/kis_image_magick_converter.cc @@ -28,7 +28,7 @@ #include <tqfileinfo.h> #include <tqstring.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdebug.h> #include <kapplication.h> #include <klocale.h> diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc index 16140414a..dd16dd0e8 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cc +++ b/filters/chalk/magick/kis_image_magick_converter.cc @@ -27,7 +27,7 @@ #include <tqfileinfo.h> #include <tqstring.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdebug.h> #include <kapplication.h> #include <klocale.h> diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc index eb3b5b852..5fd196f8a 100644 --- a/filters/kword/oowriter/oowriterimport.cc +++ b/filters/kword/oowriter/oowriterimport.cc @@ -29,7 +29,7 @@ #include "oowriterimport.h" #include <ooutils.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdebug.h> #include <kzip.h> diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index 2f9f4fc6b..8d36f43b5 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -28,7 +28,7 @@ #include <kglobal.h> #include <klocale.h> #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kstandarddirs.h> #include <krecentdocument.h> #include <ktempfile.h> diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index f099fad06..333406902 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -32,7 +32,7 @@ #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kprinter.h> #include <KoMainWindow.h> diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp index 0f06a1561..51265bdbb 100644 --- a/kexi/core/kexiaboutdata.cpp +++ b/kexi/core/kexiaboutdata.cpp @@ -21,7 +21,7 @@ #include "kexiaboutdata.h" #include <kexi_version.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kofficeversion.h> //only for KOFFICE_VERSION_STRING #include <klocale.h> diff --git a/kexi/debian/control b/kexi/debian/control index 8f0159dda..6defe77d3 100644 --- a/kexi/debian/control +++ b/kexi/debian/control @@ -2,7 +2,7 @@ Source: kexi Section: kde Priority: optional Maintainer: Igor Genibel <igenibel@debian.org> -Build-Depends: automake1.7, debhelper (>= 4.2.0), kdelibs4-dev (>= 4:3.2.0), flex, libpqxx-dev, libmysqlclient-dev, libreadline5-dev, cdbs +Build-Depends: automake1.7, debhelper (>= 4.2.0), tdelibs4-dev (>= 4:3.2.0), flex, libpqxx-dev, libmysqlclient-dev, libreadline5-dev, cdbs Standards-Version: 3.6.1.0 Package: kexi diff --git a/kexi/doc/common/doxygen.css b/kexi/doc/common/doxygen.css index a8be4adc0..f3e5ed910 100644 --- a/kexi/doc/common/doxygen.css +++ b/kexi/doc/common/doxygen.css @@ -1,6 +1,6 @@ /******************************************************************************* - Style sheet for kdelibs doxygen documentation. + Style sheet for tdelibs doxygen documentation. Copyright (c) Anders Lund <anders@alweb.dk> 2002 This script is made available under the terms of the General Public Licence. diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 7114d65b3..e78c9df2f 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -428,7 +428,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem Workaround: removed most of apps/katepart/syntax/*.xml files - win32: fix freeze on 1st char entering - win32: fix mmap for win9x (InterlockedCompareExchange() replacement is needed - -> see kdelibs/win/mmap.c) + -> see tdelibs/win/mmap.c) - call qApp->processEvents() on highlighting schema loading, so 'wait' cursor can be visible on 1st loading. - allow saving invalid queries (KexiQueryDesignerSQLView::storeNewData()) @@ -645,10 +645,10 @@ for blobs...The client has to read the _entire_ blob into memory."; use: application/x-vnd.kexi.connections.shortcut application/x-vnd.kexi.table.shortcut application/x-vnd.kexi.query.shortcut -- remove x-vnd.kexi.desktop in kdelibs -- copy mimetypes and magic def. to kdelibs (keep it within Kexi for compat.) +- remove x-vnd.kexi.desktop in tdelibs +- copy mimetypes and magic def. to tdelibs (keep it within Kexi for compat.) - remake kexi mime type svg icons -- copy kexi mime icons to kdelibs, remove old one +- copy kexi mime icons to tdelibs, remove old one ** Ask SQLite devs for a possibility for adding a field to indicate kexi-sqlite format without opening database @@ -1091,7 +1091,7 @@ TODO: PqxxMigrate::drv_copyTable(): we've switched from BLOBs to LongText Startup templates - TODO: : use main/startup/TemplateItem.ui and main/startup/TemplateWidget.h - http://lxr.kde.org/source/KDE/kdebase/kicker/kicker/ui/addapplet.cpp?v=3.5-branch#188 + http://lxr.kde.org/source/KDE/tdebase/kicker/kicker/ui/addapplet.cpp?v=3.5-branch#188 - TODO look at schemas at http://www.databaseanswers.org/data_models/index.htm Find/Replace REPLACE diff --git a/kexi/formeditor/Makefile.am b/kexi/formeditor/Makefile.am index 8f8aacbe6..5295c223c 100644 --- a/kexi/formeditor/Makefile.am +++ b/kexi/formeditor/Makefile.am @@ -27,7 +27,7 @@ libkformdesigner_la_LIBADD = \ servicetypesdir = $(kde_servicetypesdir) servicetypes_DATA=widgetfactory.desktop -SUBDIRS = . factories #test #scripting #kdevelop_plugin +SUBDIRS = . factories #test #scripting #tdevelop_plugin messages: rc.cpp $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index a7fa5d3e3..acc72c240 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -44,7 +44,7 @@ #include <klineedit.h> #include <klocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "containerfactory.h" #include "container.h" diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index b9e85b9c1..24827e131 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -33,7 +33,7 @@ #include <kgenericfactory.h> #include <klocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #if TDE_VERSION < KDE_MAKE_VERSION(3,1,9) # include <tqdatetimeedit.h> diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 6ec87fc00..a2ed0dac0 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -50,7 +50,7 @@ #include <ktabwidget.h> #include <kfontdialog.h> -#include <kdeversion.h> +#include <tdeversion.h> #if TDE_VERSION >= KDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN) # include <kactioncollection.h> #endif diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp index 7166e7cc6..0cfe04833 100644 --- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp @@ -25,7 +25,7 @@ #include <tqevent.h> #include <tqobjectlist.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaction.h> #include <kinstance.h> #include <klocale.h> diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index f309283f0..cd51817a7 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -25,7 +25,7 @@ #include <tqevent.h> #include <tqobjectlist.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaction.h> #include <kinstance.h> #include <klocale.h> diff --git a/kexi/kexidb/drivers/configure.in.in b/kexi/kexidb/drivers/configure.in.in index 01d426b6d..051bf07d0 100644 --- a/kexi/kexidb/drivers/configure.in.in +++ b/kexi/kexidb/drivers/configure.in.in @@ -53,7 +53,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for MySQL libraries]) - mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + mysql_libdirs="$ac_mysql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(mysql/libmysqlclient.so, $mysql_libdirs, mysql_libdir) if test -r $mysql_libdir/mysql/libmysqlclient.so; then MYSQL_LIBS=$mysql_libdir @@ -149,7 +149,7 @@ dnl *** Check that the paths given to configure are valid *** fi AC_MSG_CHECKING([for PostgreSQL C API libraries]) - pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpq.so, $pgsql_libdirs, pgsql_libdir) if test -r $pgsql_libdir/libpq.so; then PG_LIBDIR=$pgsql_libdir @@ -229,7 +229,7 @@ dnl libpqxx libraries dnl ======================================== if test "$compile_pgsql_plugin" = "yes"; then AC_MSG_CHECKING([for PostgreSQL C++ libraries]) - pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff" + pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$tdelibsuff /usr/lib$tdelibsuff" AC_FIND_FILE(libpqxx.so, $pqxx_libdirs, pqxx_libdir) if test -r $pqxx_libdir/libpqxx.so; then PQXX_LIBDIR=$pqxx_libdir diff --git a/kexi/kexidb/kexidb_export.h b/kexi/kexidb/kexidb_export.h index 2a908b662..cd18539f4 100644 --- a/kexi/kexidb/kexidb_export.h +++ b/kexi/kexidb/kexidb_export.h @@ -21,9 +21,9 @@ #define _KEXIDB_EXPORT_H_ #ifdef __cplusplus -# include <kdeversion.h> /* this will also include <kdelibs_export.h>, if available */ +# include <tdeversion.h> /* this will also include <tdelibs_export.h>, if available */ #endif -/* KDE_EXPORT will be defined multiple times without this on kdelibs 3.3 (tested on 3.3.1) */ +/* KDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ #include <kdemacros.h> /* workaround for KDElibs < 3.2 on !win32 */ diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 37ff1c83f..5594d5779 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -46,7 +46,7 @@ #include <kdebug.h> #include <kkeydialog.h> #include <kedittoolbar.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kglobalsettings.h> #include <kparts/componentfactory.h> #include <ktip.h> diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 6f1fc51d4..9beffbf5d 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -26,7 +26,7 @@ #include <kapplication.h> #include <kfiledialog.h> #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kexinewstuff.h" diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index e2240e5c0..e4bfd5801 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. - Loosely based on kdevelop/src/statusbar.cpp - Copyright (C) 2001 by Bernd Gehrmann <bernd@kdevelop.org> + Loosely based on tdevelop/src/statusbar.cpp + Copyright (C) 2001 by Bernd Gehrmann <bernd@tdevelop.org> */ #include "kexistatusbar.h" diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index 15b8f5838..bab1277a5 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. - Loosely based on kdevelop/src/statusbar.h - Copyright (C) 2001 by Bernd Gehrmann <bernd@kdevelop.org> + Loosely based on tdevelop/src/statusbar.h + Copyright (C) 2001 by Bernd Gehrmann <bernd@tdevelop.org> */ #ifndef KEXISTATUSBAR_H @@ -26,7 +26,7 @@ //temporary #define KexiStatusBar_KTEXTEDITOR_USED 0 -#include <kdeversion.h> +#include <tdeversion.h> #include <kstatusbar.h> #include <tqmap.h> diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h index 3fe7b28d0..f3feafc43 100644 --- a/kexi/main/ksplitter.h +++ b/kexi/main/ksplitter.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tqpushbutton.h> -#include <kdeversion.h> +#include <tdeversion.h> #ifndef NO_KDE2 #include <netwm_def.h> diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index f8634e82e..476f924a4 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -34,7 +34,7 @@ #include <klineedit.h> #include <kprinter.h> #include <kpushbutton.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <tqlabel.h> #include <tqtimer.h> diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 61746d5c3..c479a4e08 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -44,7 +44,7 @@ #include <kmimetype.h> #include <kmessagebox.h> #include <kcmdlineargs.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kprogress.h> #include <ktextedit.h> #include <kstaticdeleter.h> diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 436667066..7f67bc767 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -37,7 +37,7 @@ #include <tqwidgetstack.h> #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinstance.h> #include <kdebug.h> #include <kpushbutton.h> diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index 0fc3525c5..2d09429e2 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -88,7 +88,7 @@ KexiDBInternalLabel::~KexiDBInternalLabel() } /*! -* This method is copied from kdebase/kdesktop/kshadowengine.cpp +* This method is copied from tdebase/kdesktop/kshadowengine.cpp * Some modifactions were made. * -- * Christian Nitschkowski @@ -140,7 +140,7 @@ TQImage KexiDBInternalLabel::makeShadow( const TQImage& textImage, for ( int i = startX; i < effectWidth; i++ ) { for ( int j = startY; j < effectHeight; j++ ) { /*! - * This method is copied from kdebase/kdesktop/kshadowengine.cpp + * This method is copied from tdebase/kdesktop/kshadowengine.cpp * Some modifactions were made. * -- * Christian Nitschkowski diff --git a/kexi/plugins/macros/lib/komacro_export.h b/kexi/plugins/macros/lib/komacro_export.h index cc4b41a80..d3174235b 100644 --- a/kexi/plugins/macros/lib/komacro_export.h +++ b/kexi/plugins/macros/lib/komacro_export.h @@ -21,10 +21,10 @@ #define KOMACRO_EXPORT_H_ #ifdef __cplusplus -# include <kdeversion.h> /* this will also include <kdelibs_export.h>, if available */ +# include <tdeversion.h> /* this will also include <tdelibs_export.h>, if available */ #endif -/* KDE_EXPORT will be defined multiple times without this on kdelibs 3.3 (tested on 3.3.1) */ +/* KDE_EXPORT will be defined multiple times without this on tdelibs 3.3 (tested on 3.3.1) */ #include <kdemacros.h> /* workaround for KDElibs < 3.2 on !win32 */ diff --git a/kexi/tools/feedback/create_kexifeedback.sh b/kexi/tools/feedback/create_kexifeedback.sh index 074b5e3f5..130626d72 100644 --- a/kexi/tools/feedback/create_kexifeedback.sh +++ b/kexi/tools/feedback/create_kexifeedback.sh @@ -27,7 +27,7 @@ mv Makefile.am.tmp Makefile.am rm po/kfeedbackwizard.pot rm -rf src rm -rf templates -rm kfeedbackwizard.kdevelop +rm kfeedbackwizard.tdevelop rm Doxyfile rm INSTALL rm NEWS diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index b07dc9975..88b72596d 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -25,7 +25,7 @@ #include <kiconloader.h> #include <kglobalsettings.h> #include <kstdguiitem.h> -#include <kdeversion.h> +#include <tdeversion.h> #include "kexidatasourcewizard.h" #include "kexidswelcome.h" diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index e1afd1f86..317950490 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index 521b1ce35..532ec0574 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kconfig.h> #include <kglobalsettings.h> #include <klocale.h> diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 94a17f4db..55440da43 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kconfig.h> #include <kglobalsettings.h> diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 8ea7ddacd..718fcbf6a 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -46,7 +46,7 @@ KexiDateFormatter::KexiDateFormatter() int yearpos, monthpos, daypos; //result of df.find() if (ok) {//look at % variables //! @todo more variables are possible here, see void KLocale::setDateFormatShort() docs -//! http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/tdecore/html/classKLocale.html#a59 +//! http://developer.kde.org/documentation/library/3.5-api/tdelibs-apidocs/tdecore/html/classKLocale.html#a59 yearpos = df.find("%y", 0, false); //&y or %y m_longYear = !(yearpos>=0 && df.mid(yearpos+1, 1)=="y"); if (!m_longYear) { diff --git a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LICENSE b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LICENSE index aaa0701ac..6be692936 100644 --- a/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LICENSE +++ b/kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/LICENSE @@ -1,3 +1,3 @@ This stencil set is distributed under the terms of BSD license. -The full terms of this license are available from kdelibs/doc/common/bsd-license.html +The full terms of this license are available from tdelibs/doc/common/bsd-license.html diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 5185dfc6f..8969ea827 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -14,7 +14,7 @@ #include <klocale.h> #include <KoGlobal.h> #include <KoZoomHandler.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index be7b2af93..9639ae716 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -46,7 +46,7 @@ #include <krecentdocument.h> #include <kparts/partmanager.h> #include <kaction.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kaboutdata.h> #include <KoQueryTrader.h> diff --git a/kplato/kplato.kdevelop b/kplato/kplato.kdevelop index 90f021f2a..cae30836d 100644 --- a/kplato/kplato.kdevelop +++ b/kplato/kplato.kdevelop @@ -1,5 +1,5 @@ <?xml version = '1.0'?> -<kdevelop> +<tdevelop> <general> <author>Raphael Langerhorst</author> <email>raphael.langerhorst@kdemail.net</email> @@ -160,4 +160,4 @@ <pcs>KDElibs</pcs> </references> </kdevcppsupport> -</kdevelop> +</tdevelop> diff --git a/kplato/kptview.cc b/kplato/kptview.cc index 16501cc4e..e986ea99e 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -52,7 +52,7 @@ #include <klistview.h> #include <kstdaccel.h> #include <kaccelgen.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kstatusbar.h> #include <kxmlguifactory.h> diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index e93977aa4..42a701e9f 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -68,7 +68,7 @@ #include <klineedit.h> #include <KoRect.h> #include <kmessagebox.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kurlrequesterdlg.h> #include <klistview.h> #include <kfiledialog.h> diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index 7f665ef7c..6cec5fc22 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -45,7 +45,7 @@ #include <ktempfile.h> #include <klocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kmultipledrag.h> #include <tqfont.h> diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index ab184148d..a86caa802 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -5407,7 +5407,7 @@ void KPrView::pddClosed() } // change from milliseconds to hh:mm:ss -// in kdelibs 3.2.90, an additional method was added that basically +// in tdelibs 3.2.90, an additional method was added that basically // allows formatting of time as a duration. Before this, you can get // weirdness (such as a duration of 12:00:03 am) depending on how the // time format is set. diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index aa68e58ef..2197cf32e 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -801,7 +801,7 @@ void KPrWebPresentationWizard::setupPage2() tqlayout->addWidget( encoding, 3, 1 ); // Fill encoding combo - // Stolen from kdelibs/kate/part/katedialogs.cpp + // Stolen from tdelibs/kate/part/katedialogs.cpp TQStringList encodings(KGlobal::charsets()->descriptiveEncodingNames()); int idx = 0; for (uint i = 0; i < encodings.count(); i++) diff --git a/kspread/Doxyfile b/kspread/Doxyfile index 169986c27..105c69e94 100644 --- a/kspread/Doxyfile +++ b/kspread/Doxyfile @@ -1147,7 +1147,7 @@ GENERATE_HTML = GENERATE_MAN = GENERATE_LATEX = TAGFILES = \ -/usr/local/trinity/share/doc/HTML/en/kdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html +/usr/local/trinity/share/doc/HTML/en/tdelibs-apidocs/qt/qt.tag=/usr/local/qt-copy/doc/html GENERATE_TAGFILE = ../apidocs/kspread/kspread.tag IGNORE_PREFIX = K HAVE_DOT = YES diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index b167be320..51ca3cdc9 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -37,7 +37,7 @@ #include <knuminput.h> #include <kspell.h> #include <kmessagebox.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kcolorbutton.h> #include <KoTabBar.h> diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index 386be712c..c456efb3f 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -45,7 +45,7 @@ #include <kbuttonbox.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kstdguiitem.h> diff --git a/kugar/README b/kugar/README index 6c6372a93..52dbd2560 100644 --- a/kugar/README +++ b/kugar/README @@ -7,7 +7,7 @@ can be reached via Email: treat@kde.org or visit http://www.koffice.org/kugar/ The former maintainer and the author of Kugar Report Designer -part can be reached via Email: adymo@kdevelop.org +part can be reached via Email: adymo@tdevelop.org The former maintainer and author of Kugar report viewer and konqueror part can be reached via Email: phil@river-bank.demon.co.uk diff --git a/kugar/kudesigner_lib/structurewidget.cpp b/kugar/kudesigner_lib/structurewidget.cpp index f7d2aed18..7ad4ac1b0 100644 --- a/kugar/kudesigner_lib/structurewidget.cpp +++ b/kugar/kudesigner_lib/structurewidget.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2005 by Alexander Dymo * -* adymo@kdevelop.org * +* adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU Library General Public License as * diff --git a/kugar/kudesigner_lib/structurewidget.h b/kugar/kudesigner_lib/structurewidget.h index 842b69861..412f2f21f 100644 --- a/kugar/kudesigner_lib/structurewidget.h +++ b/kugar/kudesigner_lib/structurewidget.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2005 by Alexander Dymo * -* adymo@kdevelop.org * +* adymo@tdevelop.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU Library General Public License as * diff --git a/kword/CHANGES b/kword/CHANGES index 70151163c..2b974a22d 100644 --- a/kword/CHANGES +++ b/kword/CHANGES @@ -87,7 +87,7 @@ Changes after KWord-1.3-beta1 - Frames default to "auto-resize" mode instead of "auto-create-new-page" - Better handing of "auto-resize" mode (manually-set size acts as minimum size) -- Make the find dialog avoid the area where the match is (requires kdelibs-CVS, will be in kde-3.2) +- Make the find dialog avoid the area where the match is (requires tdelibs-CVS, will be in kde-3.2) - New: PDF import filter (see also koffice/lib/CHANGES, especially the kotext part) @@ -335,7 +335,7 @@ Auto-switching between editing of text and editing of frames. All types of frames can be set as "copy". Flesch reading ease score and enhanced layout added to the statistics dialog. Insert clipart (WMF). -More spellchecking options (needs kdelibs-2.2-cvs). +More spellchecking options (needs tdelibs-2.2-cvs). Added the ability for frames to grow and shrink when more or less text flows in them. Added undo-redo availability to many user-actions. New bullets-numbering dialog (visible in the stylist and the paragraph editor) diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 4f541e541..fdd6eb6ba 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -1721,7 +1721,7 @@ bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) m_scrollTimer->stop(); m_mousePressed = false; break; - case TQEvent::AccelOverride: // was part of KeyPress - changed due to kdelibs BUG! + case TQEvent::AccelOverride: // was part of KeyPress - changed due to tdelibs BUG! { // kdDebug() << " KeyPress m_currentFrameSetEdit=" << m_currentFrameSetEdit << " isRW="<<m_doc->isReadWrite() << endl; // kdDebug() << " m_printing=" << m_printing << " mousemode=" << m_mouseMode << " (MM_EDIT=" << MM_EDIT<<")"<<endl; diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index fdea1cf7e..f3d70cb67 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -2,7 +2,7 @@ Copyright (C) 2002 Joseph Wenninger <jowenn@kde.org> - Large parts are taken from kdebase/konqueror/konq_actions.* + Large parts are taken from tdebase/konqueror/konq_actions.* Copyright (C) 2000 Simon Hausmann <hausmann@kde.org> This library is free software; you can redistribute it and/or diff --git a/kword/KWMailMergeLabelAction.h b/kword/KWMailMergeLabelAction.h index 3a38e2d9a..03e84d730 100644 --- a/kword/KWMailMergeLabelAction.h +++ b/kword/KWMailMergeLabelAction.h @@ -2,7 +2,7 @@ Copyright (C) 2002 Joseph Wenninger <jowenn@kde.org> - Large parts are taken from kdebase/konqueror/konq_actions.* + Large parts are taken from tdebase/konqueror/konq_actions.* Copyright (C) 2000 Simon Hausmann <hausmann@kde.org> This library is free software; you can redistribute it and/or diff --git a/kword/KWView.cpp b/kword/KWView.cpp index fd31fff2f..4ec739eb7 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -116,7 +116,7 @@ #include <kstdaction.h> #include <ktempfile.h> #include <kurldrag.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kiconloader.h> #include <tqclipboard.h> diff --git a/lib/kdoc.rules b/lib/kdoc.rules index e70b58a0b..ec43dc052 100644 --- a/lib/kdoc.rules +++ b/lib/kdoc.rules @@ -1,4 +1,4 @@ -# These are the rules used by makekdedoc to generate the kdelibs +# These are the rules used by makekdedoc to generate the tdelibs # documentation with KDOC. Please update them if I forget any # dependencies. # diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 233764895..ecbd496f3 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -303,7 +303,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, KInstance* instan TQString path = value; TQString name; - // Support for kdelibs-3.5's new RecentFiles format: name[url] + // Support for tdelibs-3.5's new RecentFiles format: name[url] if(path.endsWith("]")) { int pos = path.find("["); name = path.mid(0, pos - 1); diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 2bd0e3b45..ba3c9d547 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -37,7 +37,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kfileitem.h> #include <kiconloader.h> #include <kio/job.h> diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index f32616dd3..5973dbb47 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -42,7 +42,7 @@ #include <kabc/addressee.h> #include <kabc/stdaddressbook.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <kmessagebox.h> #include <ktar.h> diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 94bc9bbbe..1219bf093 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -34,7 +34,7 @@ #include <kaboutdata.h> #include <kprinter.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kstdaction.h> #include <kapplication.h> #include <kmessagebox.h> diff --git a/lib/kofficecore/KoPictureClipart.cpp b/lib/kofficecore/KoPictureClipart.cpp index d5c482f8a..12a867110 100644 --- a/lib/kofficecore/KoPictureClipart.cpp +++ b/lib/kofficecore/KoPictureClipart.cpp @@ -25,7 +25,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #if ! KDE_IS_VERSION( 3,1,90 ) #include <kdebugclasses.h> #endif diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp index 4b47b2288..9edbc981a 100644 --- a/lib/kofficecore/KoPictureEps.cpp +++ b/lib/kofficecore/KoPictureEps.cpp @@ -34,7 +34,7 @@ #include <kglobal.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #if ! KDE_IS_VERSION( 3,1,90 ) #include <kdebugclasses.h> #endif @@ -104,7 +104,7 @@ TQImage KoPictureEps::scaleWithGhostScript(const TQSize& size, const int resolut // Helper method for scaleWithGhostScript. Returns 1 on success, 0 on error, -1 if nothing generated // (in which case another 'output device' can be tried) int KoPictureEps::tryScaleWithGhostScript(TQImage &image, const TQSize& size, const int resolutionx, const int resolutiony, const char* device ) -// Based on the code of the file kdelibs/kimgio/eps.cpp +// Based on the code of the file tdelibs/kimgio/eps.cpp { kdDebug(30003) << "Sampling with GhostScript, using device \"" << device << "\" (in KoPictureEps::tryScaleWithGhostScript)" << endl; diff --git a/lib/kofficecore/KoPictureWmf.cpp b/lib/kofficecore/KoPictureWmf.cpp index ccbab3620..96d108177 100644 --- a/lib/kofficecore/KoPictureWmf.cpp +++ b/lib/kofficecore/KoPictureWmf.cpp @@ -25,7 +25,7 @@ #include <tqpixmap.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #if ! KDE_IS_VERSION( 3,1,90 ) #include <kdebugclasses.h> #endif diff --git a/lib/kofficecore/KoSpeaker.h b/lib/kofficecore/KoSpeaker.h index 1e2d3188c..b853bdeca 100644 --- a/lib/kofficecore/KoSpeaker.h +++ b/lib/kofficecore/KoSpeaker.h @@ -190,7 +190,7 @@ private: // Return the KTTSD daemon version string. TQString getKttsdVersion(); - // These methods correspond to dcop interface in kdelibs/interfaces/kspeech/kspeech.h. + // These methods correspond to dcop interface in tdelibs/interfaces/kspeech/kspeech.h. // They use manual marshalling, instead of using kspeech_stub, because KOffice // supports KDE 3.3 and above and kspeech.h didn't appear until 3.4. void sayScreenReaderOutput(const TQString &msg, const TQString &talker); diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 62c8358d6..343d47049 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -26,7 +26,7 @@ #include <kdesktopfile.h> #include <ksimpleconfig.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinstance.h> #include <ksavefile.h> #include <kstandarddirs.h> diff --git a/lib/kofficecore/koffice_export.h b/lib/kofficecore/koffice_export.h index b0da017e3..cb54dbea4 100644 --- a/lib/kofficecore/koffice_export.h +++ b/lib/kofficecore/koffice_export.h @@ -23,7 +23,7 @@ #ifndef _KOFFICE_EXPORT_H #define _KOFFICE_EXPORT_H -#include <kdeversion.h> +#include <tdeversion.h> #ifdef TQ_WS_WIN diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 963ee7e8a..19fd8c924 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <tqlayout.h> #include <tqpushbutton.h> diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 3d1609edc..1e5261330 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -27,7 +27,7 @@ #include "KoTemplateChooseDia.h" #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kfiledialog.h> #include <kinstance.h> #include <KoFilterManager.h> @@ -315,7 +315,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout TQString key=TQString( "File%1" ).tqarg( i ); value=d->m_instance->config()->readPathEntry( key ); if ( !value.isEmpty() ) { - // Support for kdelibs-3.5's new RecentFiles format: name[url] + // Support for tdelibs-3.5's new RecentFiles format: name[url] TQString s = value; if ( s.endsWith("]") ) { diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp index 9b2cb29c9..b0520a2c1 100644 --- a/lib/kofficeui/tktoolbarbutton.cpp +++ b/lib/kofficeui/tktoolbarbutton.cpp @@ -27,7 +27,7 @@ #include <tqdrawutil.h> #include <tqstyle.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kapplication.h> #include <kiconeffect.h> #include <kiconloader.h> diff --git a/lib/kopainter/svgpathparser.cc b/lib/kopainter/svgpathparser.cc index 8d9375fea..5698cd47e 100644 --- a/lib/kopainter/svgpathparser.cc +++ b/lib/kopainter/svgpathparser.cc @@ -405,7 +405,7 @@ SVGPathParser::parseSVG( const TQString &s, bool process ) // This works by converting the SVG arc to "simple" beziers. // For each bezier found a svgToCurve call is done. -// Adapted from Niko's code in kdelibs/tdecore/svgicons. +// Adapted from Niko's code in tdelibs/tdecore/svgicons. // Maybe this can serve in some shared lib? (Rob) void SVGPathParser::calculateArc(bool relative, double &curx, double &cury, double angle, double x, double y, double r1, double r2, bool largeArcFlag, bool sweepFlag) diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 7d6c809e6..6ffdcf5c3 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -41,7 +41,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <klocale.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kapplication.h> namespace KoProperty { diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index f53c5ec28..634641b88 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqtooltip.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kfontrequester.h> #include <kaccelmanager.h> #include <klocale.h> diff --git a/lib/kotext/KFontDialog_local.h b/lib/kotext/KFontDialog_local.h index 921946af8..b9d4853c8 100644 --- a/lib/kotext/KFontDialog_local.h +++ b/lib/kotext/KFontDialog_local.h @@ -24,7 +24,7 @@ * Boston, MA 02110-1301, USA. */ -/*This local copy has been added to be able to hide the preview pane of the font chooser. A patch has been made in kdelibs since 3.5. This local copy can be disposed of when we require kdelibs 3.5 and higher*/ +/*This local copy has been added to be able to hide the preview pane of the font chooser. A patch has been made in tdelibs since 3.5. This local copy can be disposed of when we require tdelibs 3.5 and higher*/ #ifndef _K_FONT_DIALOG_LOCAL_H_ #define _K_FONT_DIALOG_LOCAL_H_ diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index c45c0481b..c859d26c5 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -28,7 +28,7 @@ #include <KoSearchDia.h> #include <KoGlobal.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kdebug.h> #include <klocale.h> #include <kinstance.h> diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 1b496a2ce..f3b8928b9 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -40,7 +40,7 @@ using namespace KSpell2; #include <klocale.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <tqtimer.h> #include <tqptrdict.h> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 4f6879560..2bc0262df 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -38,7 +38,7 @@ #include <KoGlobal.h> #include <tqgroupbox.h> #include <knuminput.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kpushbutton.h> #include <kcombobox.h> diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index 7b51bb4fa..42e8d2b0d 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -44,7 +44,7 @@ #include "KoParagCounter.h" #include "KoTextDocument.h" #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kglobal.h> #include <klocale.h> #include <tqtextengine_p.h> diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp index f981dd264..b3f24708a 100644 --- a/lib/kotext/KoTextDocument.cpp +++ b/lib/kotext/KoTextDocument.cpp @@ -30,7 +30,7 @@ #include <KoXmlNS.h> #include <KoDom.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <tqapplication.h> #include <assert.h> diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 0f8edaf85..fa1b03feb 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -41,7 +41,7 @@ #include <kglobal.h> #include <kdialogbase.h> #include <kconfig.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kinstance.h> #include <kcalendarsystem.h> #include <kaboutdata.h> diff --git a/lib/kotext/configure.in.bot b/lib/kotext/configure.in.bot index 1d19ed696..509b061a9 100644 --- a/lib/kotext/configure.in.bot +++ b/lib/kotext/configure.in.bot @@ -1,6 +1,6 @@ if test -z "$LIBKSPELL2"; then echo "" - echo "You don't use kdelibs CVS (kspell2 not found). Spell-checking disabled." + echo "You don't use tdelibs CVS (kspell2 not found). Spell-checking disabled." echo "" all_tests=bad fi diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 4b156d6d1..488b7409d 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -25,7 +25,7 @@ #include <tqtooltip.h> #include <kapplication.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kfiledialog.h> #include <kiconloader.h> #include <klistview.h> diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index 4a98aa119..98c8e8288 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -34,7 +34,7 @@ #include <kurl.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <klocale.h> #include <kmessagebox.h> #include <kio/netaccess.h> diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp index 97f0b5196..db45d1553 100644 --- a/lib/store/KoTarStore.cpp +++ b/lib/store/KoTarStore.cpp @@ -24,7 +24,7 @@ #include <ktar.h> #include <kdebug.h> #include <kurl.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kio/netaccess.h> KoTarStore::KoTarStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification ) diff --git a/lib/store/KoZipStore.cpp b/lib/store/KoZipStore.cpp index 1fbe6145a..c1b7d01f0 100644 --- a/lib/store/KoZipStore.cpp +++ b/lib/store/KoZipStore.cpp @@ -23,7 +23,7 @@ #include <kzip.h> #include <kdebug.h> -#include <kdeversion.h> +#include <tdeversion.h> #include <kurl.h> #include <kio/netaccess.h> #if ! KDE_IS_VERSION( 3, 4, 1 ) @@ -40,7 +40,7 @@ KoZipStore::KoZipStore( const TQString & _filename, Mode _mode, const TQCString m_pZip = new KZip( _filename ); #if ! KDE_IS_VERSION( 3, 4, 1 ) - // Workaround for KZip KSaveFile double deletion in kdelibs-3.4, + // Workaround for KZip KSaveFile double deletion in tdelibs-3.4, // when trying to write to a non-writable directory. TQDir dir( TQFileInfo( _filename ).dir() ); if (_mode == Write && !TQFileInfo( dir.path() ).isWritable() ) diff --git a/lib/store/SPEC b/lib/store/SPEC index e72286a43..4010e33f3 100644 --- a/lib/store/SPEC +++ b/lib/store/SPEC @@ -21,7 +21,7 @@ The purpose of this document is to define a common KOffice Storage Structure. Torben, Reggie, and all the others agreed on storing embedded KOffice Parts and binary data (e.g. pictures, movies, sounds) via a simple tar.gz-structure. -The support class for the tar format is kdelibs/kio/ktar.*, written by Torben +The support class for the tar format is tdelibs/kio/ktar.*, written by Torben and finished by David. The obvious benefits of this type of storage are: diff --git a/lib/store/update_kzip.sh b/lib/store/update_kzip.sh index bc47fc098..3c63626af 100644 --- a/lib/store/update_kzip.sh +++ b/lib/store/update_kzip.sh @@ -1,15 +1,15 @@ #!/bin/sh header="// GENERATED FILE. Do not edit! Generated from kzip.cpp by $0" echo "$header" > kozip.cpp -cat ../../../kdelibs/kio/kio/kzip.cpp >> kozip.cpp || exit 1 +cat ../../../tdelibs/kio/kio/kzip.cpp >> kozip.cpp || exit 1 echo "$header" > kozip.h -cat ../../../kdelibs/kio/kio/kzip.h >> kozip.h || exit 1 +cat ../../../tdelibs/kio/kio/kzip.h >> kozip.h || exit 1 echo "$header" > kofilterdev.cpp -cat ../../../kdelibs/kio/kio/kfilterdev.cpp >> kofilterdev.cpp || exit 1 +cat ../../../tdelibs/kio/kio/kfilterdev.cpp >> kofilterdev.cpp || exit 1 echo "$header" > kofilterdev.h -cat ../../../kdelibs/kio/kio/kfilterdev.h >> kofilterdev.h || exit 1 +cat ../../../tdelibs/kio/kio/kfilterdev.h >> kofilterdev.h || exit 1 echo "$header" > kolimitediodevice.h -cat ../../../kdelibs/kio/kio/klimitediodevice.h >> kolimitediodevice.h || exit 1 +cat ../../../tdelibs/kio/kio/klimitediodevice.h >> kolimitediodevice.h || exit 1 perl -pi -e 's/KZip/KoZip/g' kozip.cpp kozip.h perl -pi -e 's/kzip\.h/kozip\.h/' kozip.cpp diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cc index f0ef9bfce..573b907c5 100644 --- a/tools/thesaurus/main.cc +++ b/tools/thesaurus/main.cc @@ -46,7 +46,7 @@ NOT TODO: #include <tqtoolbutton.h> #include <kiconloader.h> #include <kfiledialog.h> -#include <kdeversion.h> +#include <tdeversion.h> /*************************************************** * |