summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m4122
-rw-r--r--configure.in6
-rw-r--r--k3bsetup/k3bsetup2.cpp2
-rw-r--r--libk3b/cddb/k3bcddb.cpp2
-rw-r--r--libk3b/core/k3bexternalbinmanager.cpp2
-rw-r--r--libk3b/core/k3bglobals.cpp2
-rw-r--r--libk3b/projects/k3bcdrdaowriter.cpp2
-rw-r--r--libk3b/projects/k3bcdrecordwriter.cpp2
-rw-r--r--libk3b/projects/k3bdvdrecordwriter.cpp2
-rw-r--r--libk3b/tools/k3bradioaction.h2
-rw-r--r--libk3b/tools/k3btoolbutton.cpp2
-rw-r--r--libk3bdevice/configure.in.in2
-rw-r--r--libk3bdevice/k3bhalconnection.cpp10
-rw-r--r--plugins/decoder/libsndfile/configure.in.in2
-rw-r--r--src/fastscale/configure.in.in2
-rw-r--r--src/fastscale/scale.cpp2
-rw-r--r--src/k3binteractiondialog.cpp2
-rw-r--r--src/k3bsystemproblemdialog.cpp2
-rw-r--r--src/option/k3bcddboptiontab.cpp2
-rw-r--r--src/option/k3bexternalbinwidget.cpp2
-rw-r--r--src/option/k3bnotifyoptiontab.cpp2
-rw-r--r--src/option/k3boptiondialog.cpp2
-rw-r--r--src/option/k3bpluginoptiontab.cpp2
-rw-r--r--src/option/k3bthemeoptiontab.cpp2
-rw-r--r--src/projects/k3bdatafileview.cpp2
-rw-r--r--src/projects/kostore/SPEC2
-rw-r--r--src/projects/kostore/koStore.cc2
-rw-r--r--src/projects/kostore/koZipStore.cc4
28 files changed, 95 insertions, 95 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index c3d3129..c51d429 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
@@ -1226,7 +1226,7 @@ if test $kde_qtver = 4; then
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
+ kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
@@ -1426,7 +1426,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
])
@@ -1475,7 +1475,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
done
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -1668,11 +1668,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.
])
@@ -1829,8 +1829,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"
@@ -1848,7 +1848,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
@@ -1863,7 +1863,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"
@@ -3527,9 +3527,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>
@@ -3537,26 +3537,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
])
@@ -4581,7 +4581,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)
@@ -4971,7 +4971,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],
@@ -5018,9 +5018,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`
@@ -5686,7 +5686,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
@@ -5706,7 +5706,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
@@ -5943,9 +5943,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 4d2dfc6..013a332 100644
--- a/configure.in
+++ b/configure.in
@@ -371,7 +371,7 @@ dnl === check for resmgr - end ============
-# HAL check from kdebase/kioslave/media
+# HAL check from tdebase/kioslave/media
AC_ARG_WITH(
hal,
@@ -675,7 +675,7 @@ dnl
dnl Don't use PKG_CHECK, since if there is no pkg-config installed,
dnl then there is no auto* magic for it either.
dnl
-dnl Tests copied from kdebase/kioslave/thumbnail/
+dnl Tests copied from tdebase/kioslave/thumbnail/
dnl
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
@@ -889,7 +889,7 @@ dnl =======================================================
#
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/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp
index 986f080..b88a9db 100644
--- a/k3bsetup/k3bsetup2.cpp
+++ b/k3bsetup/k3bsetup2.cpp
@@ -35,7 +35,7 @@
#include <kinputdialog.h>
#include <kstandarddirs.h>
#include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <ktextedit.h>
#include "k3bsetup2.h"
diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp
index 23da695..416ab10 100644
--- a/libk3b/cddb/k3bcddb.cpp
+++ b/libk3b/cddb/k3bcddb.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kconfig.h>
#include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "k3bcddb.h"
#include "k3bcddbhttpquery.h"
diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp
index ac9ffa4..7895326 100644
--- a/libk3b/core/k3bexternalbinmanager.cpp
+++ b/libk3b/core/k3bexternalbinmanager.cpp
@@ -18,7 +18,7 @@
#include <kdebug.h>
#include <kprocess.h>
#include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqstring.h>
#include <tqregexp.h>
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 09373be..be9a7a1 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -25,7 +25,7 @@
#include <k3bcore.h>
#include <k3bhalconnection.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kglobal.h>
#include <klocale.h>
#include <kstandarddirs.h>
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp
index 5d0f780..4494859 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -459,7 +459,7 @@ void K3bCdrdaoWriter::start()
d->speedEst->reset();
- delete m_process; // kdelibs want this!
+ delete m_process; // tdelibs want this!
m_process = new K3bProcess();
m_process->setRunPrivileged(true);
m_process->setSplitStdout(false);
diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp
index acc1d2d..53fed8b 100644
--- a/libk3b/projects/k3bcdrecordwriter.cpp
+++ b/libk3b/projects/k3bcdrecordwriter.cpp
@@ -138,7 +138,7 @@ void K3bCdrecordWriter::setWritingMode( int mode )
void K3bCdrecordWriter::prepareProcess()
{
- if( m_process ) delete m_process; // kdelibs want this!
+ if( m_process ) delete m_process; // tdelibs want this!
m_process = new K3bProcess();
m_process->setRunPrivileged(true);
// m_process->setPriority( KProcess::PrioHighest );
diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp
index a7b8db7..5e0f996 100644
--- a/libk3b/projects/k3bdvdrecordwriter.cpp
+++ b/libk3b/projects/k3bdvdrecordwriter.cpp
@@ -38,7 +38,7 @@ K3bDvdrecordWriter::~K3bDvdrecordWriter()
void K3bDvdrecordWriter::prepareProcess()
{
- if( m_process ) delete m_process; // kdelibs want this!
+ if( m_process ) delete m_process; // tdelibs want this!
m_process = new K3bProcess();
m_process->setRunPrivileged(true);
m_process->setSplitStdout(true);
diff --git a/libk3b/tools/k3bradioaction.h b/libk3b/tools/k3bradioaction.h
index 262e153..50723f7 100644
--- a/libk3b/tools/k3bradioaction.h
+++ b/libk3b/tools/k3bradioaction.h
@@ -24,7 +24,7 @@
* flag which says if it should always emit the signals
* even if it was checked twice.
*
- * Docu copied from kdelibs
+ * Docu copied from tdelibs
*/
class LIBK3B_EXPORT K3bRadioAction : public KToggleAction
{
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index 67af0d5..8f2a20e 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -57,7 +57,7 @@ void K3bToolButton::drawButton( TQPainter* p )
TQToolButton::drawButton( p );
//
- // code below comes from ktoolbarbutton.cpp from the kdelibs sources
+ // code below comes from ktoolbarbutton.cpp from the tdelibs sources
// see the file for copyright information
//
if( TQToolButton::popup() ) {
diff --git a/libk3bdevice/configure.in.in b/libk3bdevice/configure.in.in
index dcfbb3b..2a14f0f 100644
--- a/libk3bdevice/configure.in.in
+++ b/libk3bdevice/configure.in.in
@@ -62,7 +62,7 @@ dnl === check for resmgr - end ============
-# HAL check from kdebase/kioslave/media
+# HAL check from tdebase/kioslave/media
AC_ARG_WITH(
hal,
diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp
index c864cbd..6228922 100644
--- a/libk3bdevice/k3bhalconnection.cpp
+++ b/libk3bdevice/k3bhalconnection.cpp
@@ -269,7 +269,7 @@ void K3bDevice::HalConnection::removeDevice( const char* udi )
int K3bDevice::HalConnection::lock( Device* dev )
{
//
- // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package
+ // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package
// Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
//
DBusMessage* dmesg = 0;
@@ -328,7 +328,7 @@ int K3bDevice::HalConnection::lock( Device* dev )
int K3bDevice::HalConnection::unlock( Device* dev )
{
//
- // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package
+ // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package
// Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
//
DBusMessage* dmesg = 0;
@@ -387,7 +387,7 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev,
const TQStringList& options )
{
//
- // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package
+ // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package
// Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
//
DBusMessage* dmesg = 0;
@@ -467,7 +467,7 @@ int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev,
const TQStringList& options )
{
//
- // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package
+ // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package
// Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
//
DBusMessage* dmesg = 0;
@@ -538,7 +538,7 @@ int K3bDevice::HalConnection::eject( K3bDevice::Device* dev,
const TQStringList& options )
{
//
- // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the kdebase package
+ // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package
// Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org>
//
DBusMessage* dmesg = 0;
diff --git a/plugins/decoder/libsndfile/configure.in.in b/plugins/decoder/libsndfile/configure.in.in
index e0efcc5..5c17cca 100644
--- a/plugins/decoder/libsndfile/configure.in.in
+++ b/plugins/decoder/libsndfile/configure.in.in
@@ -3,7 +3,7 @@ dnl
dnl Don't use PKG_CHECK, since if there is no pkg-config installed,
dnl then there is no auto* magic for it either.
dnl
-dnl Tests copied from kdebase/kioslave/thumbnail/
+dnl Tests copied from tdebase/kioslave/thumbnail/
dnl
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
diff --git a/src/fastscale/configure.in.in b/src/fastscale/configure.in.in
index 287e4e9..ffd60fa 100644
--- a/src/fastscale/configure.in.in
+++ b/src/fastscale/configure.in.in
@@ -3,7 +3,7 @@
#
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/fastscale/scale.cpp b/src/fastscale/scale.cpp
index 35928de..d87717f 100644
--- a/src/fastscale/scale.cpp
+++ b/src/fastscale/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/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index 88ab150..738661c 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -46,7 +46,7 @@
#include <kconfig.h>
#include <kiconloader.h>
#include <kglobalsettings.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index a7575f0..1cd97a1 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -548,7 +548,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
//
// Never run K3b as root and especially not suid root! The latter is not possible anyway since
- // the kdelibs refuse it.
+ // the tdelibs refuse it.
//
if( ::getuid() == 0 ) {
problems.append( K3bSystemProblem( K3bSystemProblem::WARNING,
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index 4410b4a..957f9fa 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -38,7 +38,7 @@
#include <knuminput.h>
#include <kconfig.h>
#include <kapplication.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
K3bCddbOptionTab::K3bCddbOptionTab( TQWidget* parent, const char* name )
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index f745da7..28c6375 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -39,7 +39,7 @@
#include <keditlistbox.h>
#include <klistview.h>
#include <kglobalsettings.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
diff --git a/src/option/k3bnotifyoptiontab.cpp b/src/option/k3bnotifyoptiontab.cpp
index c94359f..5c12ee6 100644
--- a/src/option/k3bnotifyoptiontab.cpp
+++ b/src/option/k3bnotifyoptiontab.cpp
@@ -14,7 +14,7 @@
*/
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "k3bnotifyoptiontab.h"
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index 4be5047..2b2b6af 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -34,7 +34,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kconfig.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include "k3bnotifyoptiontab.h"
diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp
index a48d001..6072e0a 100644
--- a/src/option/k3bpluginoptiontab.cpp
+++ b/src/option/k3bpluginoptiontab.cpp
@@ -28,7 +28,7 @@
#include <kdialogbase.h>
#include <kconfig.h>
#include <kglobalsettings.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqstringlist.h>
#include <tqpushbutton.h>
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index 45e435c..0e037fc 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -30,7 +30,7 @@
#include <kstandarddirs.h>
#include <ktar.h>
#include <kurlrequesterdlg.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <tqlabel.h>
#include <tqfile.h>
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index e5c0e84..b29f8ad 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -44,7 +44,7 @@
#include <kdebug.h>
#include <kshortcut.h>
#include <krun.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
K3bDataFileView::K3bDataFileView( K3bView* view, K3bDataDirTreeView* dirTreeView, K3bDataDoc* doc, TQWidget* parent )
diff --git a/src/projects/kostore/SPEC b/src/projects/kostore/SPEC
index e72286a..4010e33 100644
--- a/src/projects/kostore/SPEC
+++ b/src/projects/kostore/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/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc
index e57bfa4..08268dc 100644
--- a/src/projects/kostore/koStore.cc
+++ b/src/projects/kostore/koStore.cc
@@ -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/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc
index 4b63a4c..1f1a526 100644
--- a/src/projects/kostore/koZipStore.cc
+++ b/src/projects/kostore/koZipStore.cc
@@ -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() )