third step, convert into tdelibs libraries.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

18 files changed, 477 insertions, 477 deletions

diff --git a/INDEX b/INDEX
index 826e345..c3f2e6c 100644
--- a/INDEX
+++ b/INDEX
@@ -34,7 +34,7 @@ Name: arts-video
 Synopsis: Video part of aRts
 
 Name: audiofile_artsplugin
-See also: kdemultimedia/audiofile_artsplugin
+See also: tdemultimedia/audiofile_artsplugin
 
 Name: cookbook
 Synopsis: Food recipe manager
@@ -47,7 +47,7 @@ Synopsis: retro game, written using KJSEmbed
 
 Name: dcopbindings
 Synopsis: Perl, Java, Python and TCL bindings for DCOP
-See also: kdebindings/dcopjava, kdebindings/dcopperl, kdebindings/kdcoppython
+See also: tdebindings/dcopjava, tdebindings/dcopperl, tdebindings/kdcoppython
 
 Name: dcopjs
 Synopsis: interactive dcop javascript shell.
@@ -83,8 +83,8 @@ URL: Macaulay2 - http://www.math.uiuc.edu/Macaulay2
 URL: Singular  - http://www.singular.uni-kl.de
 URL: Yacas     - http://yacas.sourceforge.net
 
-Name: fuse_kio
-Synopsis: kioslave for FUSE, a program to mount user-space filesystems.
+Name: fuse_tdeio
+Synopsis: tdeioslave for FUSE, a program to mount user-space filesystems.
 URL: http://sourceforge.net/projects/avf
 
 Name: gadget
@@ -93,22 +93,22 @@ Synopsis: Webservices application (SOAP, XML-RPC)
 Name: gofai-wmt
 Synopsis: organize items into networks which can then be easily navigated using a visual interface.
 
-Name: gopher_kioslave
-Synopsis: kioslave for the gopher protocol
+Name: gopher_tdeioslave
+Synopsis: tdeioslave for the gopher protocol
 
 Name: gst
 Synopsis: KDE wrapper for GStreamer
-Notes: Useful for kdemultimedia/juk
+Notes: Useful for tdemultimedia/juk
 
 Name: imap4
-Synopsis: IMAP4 library (rework of old kioslave)
+Synopsis: IMAP4 library (rework of old tdeioslave)
 
 Name: icecream
 Synopsis: Possibly a re-implementation of distcc in C++ for KDE builds
 URL: http://distcc.samba.org
 
 Name: jabberservices
-Synopsis: kioslave to access services over Jabber protcol
+Synopsis: tdeioslave to access services over Jabber protcol
 
 Name: kabpasswd
 Synopsis: KAB plugin to get addresses from password files
@@ -134,7 +134,7 @@ URL: http://www.informatik.uni-oldenburg.de/~bigboss/kappdock
 
 Name: karchiver
 Synopsis: Compressed files manager
-See also: kdeutils/ark
+See also: tdeutils/ark
 
 Name: kard
 Synopsis: Memory-like game for young children
@@ -199,20 +199,20 @@ Synopsis: Media autorun service (eg for CDROMs).
 Name: kdedebian
 Synopsis: Various Debian related projects, including APT front end, live CD and configuration tool.
 
-Name: kdepim
-Synopsis: Stuff from the KDEPIM suite that isn't being used.
+Name: tdepim
+Synopsis: Stuff from the TDEPIM suite that isn't being used.
 
-Name: kdeprintphoto
+Name: tdeprintphoto
 Synopsis: Front end for printing photographs.
 
 Name: kdestdiface
 Synopsis: Possibly some kind of coding example for standard UI.
 
 Name: kdeutil
-Synopsis: general support code, aimed at integration into kdelibs for KDE4.
+Synopsis: general support code, aimed at integration into tdelibs for KDE4.
 
-Name: kdmthemes
-Synopsis: experimental theming engine for KDM.
+Name: tdmthemes
+Synopsis: experimental theming engine for TDM.
 
 Name: kdom
 Synopsis: DOM parser implementation for KDE
@@ -244,7 +244,7 @@ Synopsis: displays events, and sends simple text messages from apps via DCOP.
 
 Name: kicq
 Synopsis: kicq is an ICQ client
-See also: kdenetwork/kopete, kdenetwork/kit
+See also: tdenetwork/kopete, tdenetwork/kit
 
 Name: kifcfg
 Synopsis: applet for changing the IP address of the host
@@ -257,31 +257,31 @@ signal strength, checking for available networks, switching between networks,
 managing network profiles, and managing card parameters.
 URL: http://kifi.staticmethod.net
 
-Name: kimproxy
+Name: tdeimproxy
 Synopsis: Generic instant messaging library
 
-Name: kio_freenet
-Synopsis: kioslave for Freenet
+Name: tdeio_freenet
+Synopsis: tdeioslave for Freenet
 URL: http://www.freenetproject.org/
 
-Name: kio_httpmail
-Synopsis: kioslave for accessing mail by webdav
+Name: tdeio_httpmail
+Synopsis: tdeioslave for accessing mail by webdav
 
-Name: kio_smbro
+Name: tdeio_smbro
 Synopsis: read-write wrapper ioslave for smb (samba)
 
-Name: kio_rdate
-Synopsis: kioslave for RFC868 time servers
+Name: tdeio_rdate
+Synopsis: tdeioslave for RFC868 time servers
 
-Name: kio-rio
-Synopsis: kioslave for parallel port RIO players
+Name: tdeio-rio
+Synopsis: tdeioslave for parallel port RIO players
 
-Name: kio_svn
-Synopsis: kioslave to access Subversion revision control system repositories
+Name: tdeio_svn
+Synopsis: tdeioslave to access Subversion revision control system repositories
 URL:  http://subversion.tigris.org/
 
 Name: kjssupport
-Synopsis: KJSEmbed language plugin for kdevelop IDE
+Synopsis: KJSEmbed language plugin for tdevelop IDE
 
 Name: klaviatura
 Synopsis: on-screen keyboard
@@ -296,7 +296,7 @@ URL: http://x.mame.net
 
 Name: kmath
 Synopsis: Edutainment framework for the K Desktop Environment
-See also: kdeedu/*
+See also: tdeedu/*
 URL: http://edu.kde.org/
 
 Name: kmathprof
@@ -310,7 +310,7 @@ Synopsis: Qt/KDE based version of xmessage
 
 Name: knapster
 Synopsis: napster client for KDE
-See also: kdenonbeta/kio_napster
+See also: kdenonbeta/tdeio_napster
 
 Name: knetworksettings
 Synopsis: network configuration and display application
@@ -325,7 +325,7 @@ Synopsis: KDE Network Utilities
 Name: koncd
 Synopsis: allows you to master CDs with mkisofs and cdrecord
 See also: kdeextragear-1/k3d, kdeextragear-1/cdbakeoven,
-kdemultimedia/kscd, kdemultimedia/kaudiocreator kdeextragear-1/kreatecd
+tdemultimedia/kscd, tdemultimedia/kaudiocreator kdeextragear-1/kreatecd
 
 Name: konqsidebar_plugins
 Synopsis: Some plugins for the Konqueror sidebar
@@ -371,13 +371,13 @@ Name: ksciplot
 Synopsis: Scientific / mathematical function plotter
 URL: https://sourceforge.net/projects/ksciplot/
 
-Name: kscriptperl
+Name: tdescriptperl
 Synopsis: library for running Perl scripts
-See also: kdelibs/interfaces/kscript
+See also: tdelibs/interfaces/tdescript
 
 Name: kssl-smime
 Synopsis: S/MIME plugin for kmail
-See also: kdepim/kmail
+See also: tdepim/kmail
 URL: http://kmail.kde.org/kmail-pgpmime-howto.html
 
 Name: kstyle2
@@ -424,13 +424,13 @@ Synopsis: KControl module and Systray icon for video mode and gamma using XF86Vi
 Name: kwhatsbroken
 Synopsis: tool to automate debugging of KDE
 
-Name: kwintv
+Name: twintv
 Synopsis: TV viewing application
 
 Name: kwireless
 Synopsis: kicker applet for displaying the signal quality of a IEEE 802.11b network.
 Notes: This applet depends on libwi to function. Possibly BSD only.
-See also: kdenetwork/wifi
+See also: tdenetwork/wifi
 URL: http://sharmas.dhs.org/~adsharma/projects/KWireless
 URL: http://sharmas.dhs.org/~adsharma/projects/libwi
 
@@ -453,7 +453,7 @@ Name: libktextedit
 Synopsis: Text Editor Widget
 
 Name: libkxpath
-Synopsis: XPath library for khtml
+Synopsis: XPath library for tdehtml
 
 Name: lyod
 Synopsis: implementation of the ICE protocol
@@ -482,7 +482,7 @@ Notes: may require Ruby
 
 Name: oscar
 Synopsis: AIM OSCAR support.
-See also: kdenetwork/kopete, kdenetwork/kit
+See also: tdenetwork/kopete, tdenetwork/kit
 
 Name: pax
 Synopsis: a project management tool
diff --git a/Makefile.in b/Makefile.in
index dd25ecd..4ad1d73 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -170,18 +170,18 @@ LIBUTIL = @LIBUTIL@
 LIBZ = @LIBZ@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
+LIB_TDECORE = @LIB_TDECORE@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIO = @LIB_TDEIO@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -288,7 +288,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
diff --git a/README b/README
index 7da8738..86194e5 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ This package contains software modules that are considered by their
 authors preceding beta stage, hence "nonbeta" (which means "alpha at
 best"), and are not normally released. The programs and libraries that
 are developed here are sometimes moved to official release packages
-(like kdegraphics) as the program or library matures to a sufficiently
+(like tdegraphics) as the program or library matures to a sufficiently
 stable state. Beware that some of the programs are not maintained or
 may be suffering bit rot.
 
diff --git a/acinclude.m4 b/acinclude.m4
index 7559cc5..7fbb4ee 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!
@@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
   fi
 
 AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
   AC_MSG_RESULT(yes)
 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
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 KDE_SET_PATHS($kde_result)
@@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -590,14 +590,14 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
 		KDE_XSL_STYLESHEET=""
@@ -694,7 +694,7 @@ AC_SUBST(kde_templatesdir)
 AC_SUBST(kde_servicesdir)
 AC_SUBST(kde_servicetypesdir)
 AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
 AC_SUBST(kde_styledir)
 AC_SUBST(kde_widgetdir)
 if test "$kde_qtver" = 1; then
@@ -914,7 +914,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
@@ -1402,7 +1402,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
     ])
 
@@ -1443,7 +1443,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
@@ -1627,7 +1627,7 @@ 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.])
+	AC_MSG_ERROR([you need to install tdelibs first.])
 fi
 fi
 ])
@@ -1738,16 +1738,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
 
 if test "$kde_qtver" = 1; then
   kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
+  kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
 ac_kde_includes="$kde_incdir"
@@ -1758,15 +1758,15 @@ 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $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"
 
 kde_widgetdir=NO
 dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("kde3/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
 AC_MSG_ERROR([
@@ -1774,10 +1774,10 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.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
@@ -1792,7 +1792,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"
 
@@ -1932,20 +1932,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -1983,7 +1983,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
  kde_cxxflags_safe="$CXXFLAGS"
 
  LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
+ CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
  LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
 
  AC_TRY_LINK([
@@ -2016,39 +2016,39 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
    AC_REQUIRE([K_PATH_X])
 
 if test $kde_qtver = 3; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
+   AC_SUBST(LIB_KABC, "-ltdeabc")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
+   AC_SUBST(LIB_KFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+   AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
@@ -2113,7 +2113,7 @@ if test "x$kde_cv_func_$1" = xyes; then
 else
   case "$1" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_$1="yes - in libkdefakes"
+		kde_cv_proto_$1="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_$1=unknown
@@ -2419,7 +2419,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
 else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
 fi
 ])
 
@@ -2483,7 +2483,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3128,26 +3128,26 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
 
 AC_DEFUN([KDE_CHECK_LIB64],
 [
-    kdelibsuff=no
+    tdelibsuff=no
     AC_ARG_ENABLE(libsuffix,
         AC_HELP_STRING([--enable-libsuffix],
             [/lib directory suffix (64,32,none[=default])]),
-            kdelibsuff=$enableval)
+            tdelibsuff=$enableval)
     # TODO: add an auto case that compiles a little C app to check
     # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no"; 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
 ])
 
@@ -3165,7 +3165,7 @@ AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AM_INIT_AUTOMAKE($1, $2)
 AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 AC_CHECK_COMPILERS
 KDE_PROG_LIBTOOL
 AM_KDE_WITH_NLS
@@ -4151,7 +4151,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)
@@ -4537,14 +4537,14 @@ 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
+dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
 AC_DEFUN([KDE_SET_PREFIX_CORE],
 [
   unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
+  dnl make $TDEDIR the default for the installation
+  AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
 
   if test "x$prefix" = "xNONE"; then
     prefix=$ac_default_prefix
@@ -4563,25 +4563,25 @@ AC_DEFUN([KDE_SET_PREFIX],
   unset CDPATH
   dnl We can't give real code to that macro, only a value.
   dnl It only matters for --help, since we set the prefix in this function anyway.
-  AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix})
+  AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
 
   KDE_SET_DEFAULT_BINDIRS
   if test "x$prefix" = "xNONE"; then
-    dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
   else
-    dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH
+    dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
     kde_save_PATH="$PATH"
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
-    KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend)
+    KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
     PATH="$kde_save_PATH"
   fi
 
   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`
@@ -4589,7 +4589,7 @@ AC_DEFUN([KDE_SET_PREFIX],
   AC_MSG_CHECKING([where to install])
   if test "x$prefix" = "xNONE"; then
     prefix=$kde_libs_prefix
-    AC_MSG_RESULT([$prefix (as returned by kde-config)])
+    AC_MSG_RESULT([$prefix (as returned by tde-config)])
   else
     dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
     given_prefix=$prefix
@@ -5246,7 +5246,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
@@ -5266,7 +5266,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
diff --git a/configure b/configure
index 01e296e..3a01bdb 100755
--- a/configure
+++ b/configure
@@ -426,7 +426,7 @@ PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
 ac_unique_file="acinclude.m4"
-ac_default_prefix=${KDEDIR:-the kde prefix}
+ac_default_prefix=${TDEDIR:-the kde prefix}
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -464,7 +464,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KSYCOCA LIB_KFILE LIB_KFM KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LEX LEXLIB LEX_OUTPUT_ROOT LFLAGS TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE mathemagics_SUBDIR_included_TRUE mathemagics_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir tdeinitdir kde_styledir kde_widgetdir LIB_TDECORE LIB_TDEUI LIB_TDEIO LIB_SMB LIB_KAB LIB_KABC LIB_TDEHTML LIB_TDESPELL LIB_TDEPARTS LIB_TDEPRINT LIB_TDEUTILS LIB_TDEPIM LIB_TDESYCOCA LIB_KFILE LIB_KFM KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LEX LEXLIB LEX_OUTPUT_ROOT LFLAGS TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE mathemagics_SUBDIR_included_TRUE mathemagics_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2075,11 +2075,11 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -2087,12 +2087,12 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
   if test "x$prefix" = "xNONE"; then
 
-   echo "$as_me:$LINENO: checking for kde-config" >&5
-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
+   echo "$as_me:$LINENO: checking for tde-config" >&5
+echo $ECHO_N "checking for tde-config... $ECHO_C" >&6
    if test -n "$KDECONFIG"; then
         kde_cv_path="$KDECONFIG";
    else
-        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+        kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
 
         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2111,16 +2111,16 @@ else
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/kde-config"; then
+	  if test -x "$dir/tde-config"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/kde-config  2>&1 "
+              evalstr="$dir/tde-config  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/kde-config"
+                kde_cv_path="$dir/tde-config"
                 break
 	      fi
             else
-		kde_cv_path="$dir/kde-config"
+		kde_cv_path="$dir/tde-config"
                 break
 	    fi
           fi
@@ -2140,10 +2140,10 @@ fi
       echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
 
-    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+    { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program kde-config was not found!
+echo "$as_me: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -2159,12 +2159,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
         kde_save_PATH="$PATH"
     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
 
-   echo "$as_me:$LINENO: checking for kde-config" >&5
-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
+   echo "$as_me:$LINENO: checking for tde-config" >&5
+echo $ECHO_N "checking for tde-config... $ECHO_C" >&6
    if test -n "$KDECONFIG"; then
         kde_cv_path="$KDECONFIG";
    else
-        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
+        kde_cache=`echo tde-config | sed 'y%./+-%__p_%'`
 
         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2183,16 +2183,16 @@ else
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/kde-config"; then
+	  if test -x "$dir/tde-config"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/kde-config  2>&1 "
+              evalstr="$dir/tde-config  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/kde-config"
+                kde_cv_path="$dir/tde-config"
                 break
 	      fi
             else
-		kde_cv_path="$dir/kde-config"
+		kde_cv_path="$dir/tde-config"
                 break
 	    fi
           fi
@@ -2212,10 +2212,10 @@ fi
       echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
 
-    { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
+    { { echo "$as_me:$LINENO: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program kde-config was not found!
+echo "$as_me: error: The important program tde-config was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -2232,13 +2232,13 @@ echo "${ECHO_T}$kde_cv_path" >&6
 
   kde_libs_prefix=`$KDECONFIG --prefix`
   if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-       { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+       { { echo "$as_me:$LINENO: 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.
                     " >&5
-echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+echo "$as_me: 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.
                     " >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -2248,8 +2248,8 @@ echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_
 echo $ECHO_N "checking where to install... $ECHO_C" >&6
   if test "x$prefix" = "xNONE"; then
     prefix=$kde_libs_prefix
-    echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
-echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
+    echo "$as_me:$LINENO: result: $prefix (as returned by tde-config)" >&5
+echo "${ECHO_T}$prefix (as returned by tde-config)" >&6
   else
         given_prefix=$prefix
     echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
@@ -6541,18 +6541,18 @@ fi;
 
 
 
-    kdelibsuff=no
+    tdelibsuff=no
     # Check whether --enable-libsuffix or --disable-libsuffix was given.
 if test "${enable_libsuffix+set}" = set; then
   enableval="$enable_libsuffix"
-  kdelibsuff=$enableval
+  tdelibsuff=$enableval
 fi;
     # TODO: add an auto case that compiles a little C app to check
     # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
+    if test "$tdelibsuff" = "no"; then
+       tdelibsuff=
     fi
-    if test -z "$kdelibsuff"; then
+    if test -z "$tdelibsuff"; then
         echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
 echo "${ECHO_T}not using lib directory suffix" >&6
 
@@ -6562,16 +6562,16 @@ _ACEOF
 
     else
         if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
+            libdir="$libdir${tdelibsuff}"
             libdir="$libdir"
           fi
 
 cat >>confdefs.h <<_ACEOF
-#define KDELIBSUFF "${kdelibsuff}"
+#define KDELIBSUFF "${tdelibsuff}"
 _ACEOF
 
-        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
+        echo "$as_me:$LINENO: result: using lib directory suffix $tdelibsuff" >&5
+echo "${ECHO_T}using lib directory suffix $tdelibsuff" >&6
     fi
 
 # Check whether --enable-fast-install or --disable-fast-install was given.
@@ -21716,7 +21716,7 @@ if test "x$kde_cv_func_strlcat" = xyes; then
 else
   case "strlcat" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_strlcat="yes - in libkdefakes"
+		kde_cv_proto_strlcat="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_strlcat=unknown
@@ -21934,7 +21934,7 @@ if test "x$kde_cv_func_strlcpy" = xyes; then
 else
   case "strlcpy" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_strlcpy="yes - in libkdefakes"
+		kde_cv_proto_strlcpy="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_strlcpy=unknown
@@ -23967,7 +23967,7 @@ if test "x$kde_cv_func_res_init" = xyes; then
 else
   case "res_init" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_res_init="yes - in libkdefakes"
+		kde_cv_proto_res_init="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_res_init=unknown
@@ -27435,41 +27435,41 @@ sed 's/^/| /' conftest.$ac_ext >&5
 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
   for ac_extension in a so sl; do
@@ -27528,7 +27528,7 @@ fi
     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
@@ -28753,7 +28753,7 @@ qt_includes=""
 if test "${with_qt_dir+set}" = set; then
   withval="$with_qt_dir"
     ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
+       ac_qt_libraries="$withval"/lib${tdelibsuff}
        ac_qt_bindir="$withval"/bin
 
 fi;
@@ -28817,7 +28817,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
@@ -29619,16 +29619,16 @@ else
 
 if test "$kde_qtver" = 1; then
   kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
+  kde_check_lib="libtdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z ""; then
 
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 
 kde_incdir=NO
@@ -29657,8 +29657,8 @@ So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 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}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/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}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
 kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
 
 kde_libdir=NO
@@ -29682,7 +29682,7 @@ kde_widgetdir=NO
 kde_widgetdir=NO
 for i in $kde_libdirs;
 do
-  for j in "kde3/plugins/designer/kdewidgets.la";
+  for j in "kde3/plugins/designer/tdewidgets.la";
   do
     echo "configure: 29687: $i/$j" >&5
     if test -r "$i/$j"; then
@@ -29704,13 +29704,13 @@ So, check this please and use another prefix!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/tdewidgets.la"; then
 { { echo "$as_me:$LINENO: error:
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs" >&5
+by tdelibs" >&5
 echo "$as_me: error:
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs" >&2;}
+by tdelibs" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -29843,8 +29843,8 @@ fi
 echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
 echo "${ECHO_T}$kde_cv_uic_plugins" >&6
 if test "$kde_cv_uic_plugins" != yes; then
-	{ { echo "$as_me:$LINENO: error: you need to install kdelibs first." >&5
-echo "$as_me: error: you need to install kdelibs first." >&2;}
+	{ { echo "$as_me:$LINENO: error: you need to install tdelibs first." >&5
+echo "$as_me: error: you need to install tdelibs first." >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
@@ -30017,20 +30017,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -30093,7 +30093,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
@@ -30105,22 +30105,22 @@ echo "${ECHO_T}yes" >&6
 else
   { { echo "$as_me:$LINENO: 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." >&5
 echo "$as_me: 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." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 
@@ -30320,20 +30320,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@@ -30396,7 +30396,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
 echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
 
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
@@ -30408,22 +30408,22 @@ echo "${ECHO_T}yes" >&6
 else
   { { echo "$as_me:$LINENO: 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." >&5
 echo "$as_me: 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." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-if eval `KDEDIR= ./conftest 2>&5`; then
+if eval `TDEDIR= ./conftest 2>&5`; then
   kde_result=done
 else
   kde_result=problems
 fi
 
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
+TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
 kde_have_all_paths=yes
 
 
@@ -30532,11 +30532,11 @@ _ACEOF
 
 
     kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-    test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-    if test -n "$KDEDIRS"; then
+    test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
+    if test -n "$TDEDIRS"; then
        kde_save_IFS=$IFS
        IFS=:
-       for dir in $KDEDIRS; do
+       for dir in $TDEDIRS; do
             kde_default_bindirs="$dir/bin $kde_default_bindirs "
        done
        IFS=$kde_save_IFS
@@ -30898,12 +30898,12 @@ echo "${ECHO_T}$kde_cv_path" >&6
 
         if test -n "$kde32ornewer"; then
 
-   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
+   echo "$as_me:$LINENO: checking for tdeconfig_compiler" >&5
+echo $ECHO_N "checking for tdeconfig_compiler... $ECHO_C" >&6
    if test -n "$KCONFIG_COMPILER"; then
         kde_cv_path="$KCONFIG_COMPILER";
    else
-        kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
+        kde_cache=`echo tdeconfig_compiler | sed 'y%./+-%__p_%'`
 
         if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -30922,16 +30922,16 @@ else
 	IFS=$kde_save_IFS
 
         for dir in $dirs; do
-	  if test -x "$dir/kconfig_compiler"; then
+	  if test -x "$dir/tdeconfig_compiler"; then
 	    if test -n ""
 	    then
-              evalstr="$dir/kconfig_compiler  2>&1 "
+              evalstr="$dir/tdeconfig_compiler  2>&1 "
 	      if eval $evalstr; then
-                kde_cv_path="$dir/kconfig_compiler"
+                kde_cv_path="$dir/tdeconfig_compiler"
                 break
 	      fi
             else
-		kde_cv_path="$dir/kconfig_compiler"
+		kde_cv_path="$dir/tdeconfig_compiler"
                 break
 	    fi
           fi
@@ -30951,10 +30951,10 @@ fi
       echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6
 
-    { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
+    { { echo "$as_me:$LINENO: error: The important program tdeconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&5
-echo "$as_me: error: The important program kconfig_compiler was not found!
+echo "$as_me: error: The important program tdeconfig_compiler was not found!
 Please check whether you installed KDE correctly.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -31100,7 +31100,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
 
         if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
  	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+            test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
 
 KDE_XSL_STYLESHEET=NO
 for i in $kde_sharedirs;
@@ -31162,7 +31162,7 @@ done
 
 
 
-kdeinitdir='$(kde_moduledir)'
+tdeinitdir='$(kde_moduledir)'
 
 
 
@@ -31180,68 +31180,68 @@ fi
 
 
 if test $kde_qtver = 3; then
-   LIB_KDECORE="-lkdecore"
+   LIB_TDECORE="-ltdecore"
 
-   LIB_KDEUI="-lkdeui"
+   LIB_TDEUI="-ltdeui"
 
-   LIB_KIO="-lkio"
+   LIB_TDEIO="-ltdeio"
 
    LIB_SMB="-lsmb"
 
    LIB_KAB="-lkab"
 
-   LIB_KABC="-lkabc"
+   LIB_KABC="-ltdeabc"
 
-   LIB_KHTML="-lkhtml"
+   LIB_TDEHTML="-ltdehtml"
 
-   LIB_KSPELL="-lkspell"
+   LIB_TDESPELL="-ltdespell"
 
-   LIB_KPARTS="-lkparts"
+   LIB_TDEPARTS="-ltdeparts"
 
-   LIB_KDEPRINT="-lkdeprint"
+   LIB_TDEPRINT="-ltdeprint"
 
-   LIB_KUTILS="-lkutils"
+   LIB_TDEUTILS="-ltdeutils"
 
-   LIB_KDEPIM="-lkdepim"
+   LIB_TDEPIM="-ltdepim"
 
 # these are for backward compatibility
-   LIB_KSYCOCA="-lkio"
+   LIB_TDESYCOCA="-ltdeio"
 
-   LIB_KFILE="-lkio"
+   LIB_KFILE="-ltdeio"
 
 elif test $kde_qtver = 2; then
-   LIB_KDECORE="-lkdecore"
+   LIB_TDECORE="-ltdecore"
 
-   LIB_KDEUI="-lkdeui"
+   LIB_TDEUI="-ltdeui"
 
-   LIB_KIO="-lkio"
+   LIB_TDEIO="-ltdeio"
 
-   LIB_KSYCOCA="-lksycoca"
+   LIB_TDESYCOCA="-ltdesycoca"
 
    LIB_SMB="-lsmb"
 
-   LIB_KFILE="-lkfile"
+   LIB_KFILE="-ltdefile"
 
    LIB_KAB="-lkab"
 
-   LIB_KHTML="-lkhtml"
+   LIB_TDEHTML="-ltdehtml"
 
-   LIB_KSPELL="-lkspell"
+   LIB_TDESPELL="-ltdespell"
 
-   LIB_KPARTS="-lkparts"
+   LIB_TDEPARTS="-ltdeparts"
 
-   LIB_KDEPRINT="-lkdeprint"
+   LIB_TDEPRINT="-ltdeprint"
 
 else
-   LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
+   LIB_TDECORE="-ltdecore -lXext $(LIB_QT)"
 
-   LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
+   LIB_TDEUI="-ltdeui $(LIB_TDECORE)"
 
-   LIB_KFM="-lkfm $(LIB_KDECORE)"
+   LIB_KFM="-lkfm $(LIB_TDECORE)"
 
-   LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
+   LIB_KFILE="-ltdefile $(LIB_KFM) $(LIB_TDEUI)"
 
-   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
+   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_TDECORE)"
 
 fi
 
@@ -32887,7 +32887,7 @@ if test "x$kde_cv_func_setenv" = xyes; then
 else
   case "setenv" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_setenv="yes - in libkdefakes"
+		kde_cv_proto_setenv="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_setenv=unknown
@@ -33100,7 +33100,7 @@ if test "x$kde_cv_func_unsetenv" = xyes; then
 else
   case "unsetenv" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_unsetenv="yes - in libkdefakes"
+		kde_cv_proto_unsetenv="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_unsetenv=unknown
@@ -33318,7 +33318,7 @@ if test "x$kde_cv_func_getdomainname" = xyes; then
 else
   case "getdomainname" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_getdomainname="yes - in libkdefakes"
+		kde_cv_proto_getdomainname="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_getdomainname=unknown
@@ -33541,7 +33541,7 @@ if test "x$kde_cv_func_gethostname" = xyes; then
 else
   case "gethostname" in
 	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_gethostname="yes - in libkdefakes"
+		kde_cv_proto_gethostname="yes - in libtdefakes"
 		;;
 	*)
 		kde_cv_proto_gethostname=unknown
@@ -34856,22 +34856,22 @@ s,@kde_templatesdir@,$kde_templatesdir,;t t
 s,@kde_servicesdir@,$kde_servicesdir,;t t
 s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t
 s,@kde_moduledir@,$kde_moduledir,;t t
-s,@kdeinitdir@,$kdeinitdir,;t t
+s,@tdeinitdir@,$tdeinitdir,;t t
 s,@kde_styledir@,$kde_styledir,;t t
 s,@kde_widgetdir@,$kde_widgetdir,;t t
-s,@LIB_KDECORE@,$LIB_KDECORE,;t t
-s,@LIB_KDEUI@,$LIB_KDEUI,;t t
-s,@LIB_KIO@,$LIB_KIO,;t t
+s,@LIB_TDECORE@,$LIB_TDECORE,;t t
+s,@LIB_TDEUI@,$LIB_TDEUI,;t t
+s,@LIB_TDEIO@,$LIB_TDEIO,;t t
 s,@LIB_SMB@,$LIB_SMB,;t t
 s,@LIB_KAB@,$LIB_KAB,;t t
 s,@LIB_KABC@,$LIB_KABC,;t t
-s,@LIB_KHTML@,$LIB_KHTML,;t t
-s,@LIB_KSPELL@,$LIB_KSPELL,;t t
-s,@LIB_KPARTS@,$LIB_KPARTS,;t t
-s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
-s,@LIB_KUTILS@,$LIB_KUTILS,;t t
-s,@LIB_KDEPIM@,$LIB_KDEPIM,;t t
-s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
+s,@LIB_TDEHTML@,$LIB_TDEHTML,;t t
+s,@LIB_TDESPELL@,$LIB_TDESPELL,;t t
+s,@LIB_TDEPARTS@,$LIB_TDEPARTS,;t t
+s,@LIB_TDEPRINT@,$LIB_TDEPRINT,;t t
+s,@LIB_TDEUTILS@,$LIB_TDEUTILS,;t t
+s,@LIB_TDEPIM@,$LIB_TDEPIM,;t t
+s,@LIB_TDESYCOCA@,$LIB_TDESYCOCA,;t t
 s,@LIB_KFILE@,$LIB_KFILE,;t t
 s,@LIB_KFM@,$LIB_KFM,;t t
 s,@KDE_INSTALLED_TRUE@,$KDE_INSTALLED_TRUE,;t t
@@ -35619,13 +35619,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
   # And if so, warn when they don't match
   if test "$kde_libs_prefix" != "$given_prefix"; then
     # And if kde doesn't know about the prefix yet
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
     if test $? -ne 0; then
       echo ""
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi
diff --git a/configure.in b/configure.in
index 438f9e8..377852f 100644
--- a/configure.in
+++ b/configure.in
@@ -106,13 +106,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
   # And if so, warn when they don't match
   if test "$kde_libs_prefix" != "$given_prefix"; then
     # And if kde doesn't know about the prefix yet
-    echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
+    echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
     if test $? -ne 0; then
       echo ""
       echo "Warning: you chose to install this package in $given_prefix,"
       echo "but KDE was found in $kde_libs_prefix."
       echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
-      echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
+      echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
       echo "Then restart KDE."
       echo ""
     fi
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9a07ba8..cb4ed2a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -153,18 +153,18 @@ LIBUTIL = @LIBUTIL@
 LIBZ = @LIBZ@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
+LIB_TDECORE = @LIB_TDECORE@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIO = @LIB_TDEIO@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -271,7 +271,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
diff --git a/doc/mathemagics/Makefile.in b/doc/mathemagics/Makefile.in
index 6d19164..0985596 100644
--- a/doc/mathemagics/Makefile.in
+++ b/doc/mathemagics/Makefile.in
@@ -137,18 +137,18 @@ LIBUTIL = @LIBUTIL@
 LIBZ = @LIBZ@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
+LIB_TDECORE = @LIB_TDECORE@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIO = @LIB_TDEIO@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -255,7 +255,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
diff --git a/mathemagics/Makefile.am b/mathemagics/Makefile.am
index 1483612..8ea9c10 100644
--- a/mathemagics/Makefile.am
+++ b/mathemagics/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(all_includes)
 SUBDIRS = pics
 
 mathemagics_SOURCES = main.cpp mathemagics.cpp optiondialog.cpp stacklevel.cpp keypad.cpp kparanoidline.cpp 
-mathemagics_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KIO) -module -avoid-version
+mathemagics_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEIO) -module -avoid-version
 
 bin_PROGRAMS = mathemagics
 
diff --git a/mathemagics/Makefile.in b/mathemagics/Makefile.in
index ff5dcf8..1857e1a 100644
--- a/mathemagics/Makefile.in
+++ b/mathemagics/Makefile.in
@@ -213,18 +213,18 @@ LIBUTIL = @LIBUTIL@
 LIBZ = @LIBZ@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
+LIB_TDECORE = @LIB_TDECORE@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIO = @LIB_TDEIO@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -331,7 +331,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
@@ -360,7 +360,7 @@ xdg_menudir = @xdg_menudir@
 INCLUDES = $(all_includes)
 SUBDIRS = pics
 mathemagics_SOURCES = main.cpp mathemagics.cpp optiondialog.cpp stacklevel.cpp keypad.cpp kparanoidline.cpp 
-mathemagics_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KIO) -module -avoid-version
+mathemagics_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEIO) -module -avoid-version
 #>- METASOURCES = AUTO
 applnk_DATA = mathemagics.desktop
 applnkdir = $(kde_appsdir)/Utilities
diff --git a/mathemagics/keypad.cpp b/mathemagics/keypad.cpp
index 9d99692..641b6f4 100644
--- a/mathemagics/keypad.cpp
+++ b/mathemagics/keypad.cpp
@@ -4,7 +4,7 @@
 #include <ntqtooltip.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "keypad.h"
 
diff --git a/mathemagics/main.cpp b/mathemagics/main.cpp
index 49aa90d..4227b25 100644
--- a/mathemagics/main.cpp
+++ b/mathemagics/main.cpp
@@ -9,9 +9,9 @@
 	Licensed under the BSD License.
 */
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <klocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
 
 #include "mathemagics.h"
 
@@ -19,20 +19,20 @@ static const char *description =
 	I18N_NOOP("A Reverse Polish Notation scientific calculator");
 	
 	
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ 0, 0, 0 }
 };
 
 int main(int argc, char *argv[])
 {
-	KAboutData aboutData( "mathemagics", I18N_NOOP("Mathemagics"), "1.1", description, KAboutData::License_BSD, "(c) 2002-2004, Jason Katz-Brown", 0, "http://katzbrown.com/mathemagics/", "jason@katzbrown.com");
+	TDEAboutData aboutData( "mathemagics", I18N_NOOP("Mathemagics"), "1.1", description, TDEAboutData::License_BSD, "(c) 2002-2004, Jason Katz-Brown", 0, "http://katzbrown.com/mathemagics/", "jason@katzbrown.com");
 	aboutData.addAuthor("Jason Katz-Brown", I18N_NOOP("Main author"), "jason@katzbrown.com");
 
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions(options);
+	TDECmdLineArgs::init(argc, argv, &aboutData);
+	TDECmdLineArgs::addCmdLineOptions(options);
 
-	KApplication a;
+	TDEApplication a;
 	Mathemagics *mathemagics = new Mathemagics(0, "Mathemagics", TQt::WStyle_ContextHelp);
 	a.setMainWidget(mathemagics);
 	mathemagics->show();
diff --git a/mathemagics/mathemagics.cpp b/mathemagics/mathemagics.cpp
index b41d338..d65721f 100644
--- a/mathemagics/mathemagics.cpp
+++ b/mathemagics/mathemagics.cpp
@@ -18,23 +18,23 @@
 #include <ntqwhatsthis.h>
 #include <ntqwidget.h>
 
-#include <kaccel.h>
-#include <kaction.h>
-#include <kconfig.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
-#include <kglobal.h>
+#include <tdefiledialog.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kkeydialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <knotifyclient.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,7 +45,7 @@
 #include "mathemagics.h"
 
 Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
-	: KMainWindow(parent, name, f)
+	: TDEMainWindow(parent, name, f)
 {
 	noSave = false;
 	enterMode = false;
@@ -69,7 +69,7 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
 	LineEdit = new EditAction(i18n("Values"), 0, this, SLOT(slotEnter()), actionCollection(), "lineedit");
 	HistoryBox = new ComboAction(i18n("History"), 0, 0, 0, actionCollection(), "history");
 	
-	keypadAct = new KToggleAction(i18n("Show Keypad"), "Ctrl+K", 0, 0, actionCollection(), "keypad");
+	keypadAct = new TDEToggleAction(i18n("Show Keypad"), "Ctrl+K", 0, 0, actionCollection(), "keypad");
 	connect(keypadAct, SIGNAL(toggled(bool)), SLOT(toggleKeypad(bool)));
 
 	keypad = new MathKeypad(dummy, "Keypad");
@@ -89,7 +89,7 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
 	TQStringList options(i18n("Degrees"));
 	options.append(i18n("Radians"));
 	options.append(i18n("Grads"));
-	angGroup = new KListAction(i18n("Angle"), 0, 0, 0, actionCollection(), "angle");
+	angGroup = new TDEListAction(i18n("Angle"), 0, 0, 0, actionCollection(), "angle");
 	angGroup->setItems(options);
 
 	options.clear();
@@ -97,11 +97,11 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
 	options.append(i18n("Decimal"));
 	options.append(i18n("Octal"));
 	options.append(i18n("Binary"));
-	baseGroup = new KListAction(i18n("Base"), 0, 0, 0, actionCollection(), "base");
+	baseGroup = new TDEListAction(i18n("Base"), 0, 0, 0, actionCollection(), "base");
 	baseGroup->setItems(options);
 
 	TQStringList defaultFormulae;
-	formulae = new KListAction(i18n("&Formulae"), 0, 0, 0, actionCollection(), "formulae");
+	formulae = new TDEListAction(i18n("&Formulae"), 0, 0, 0, actionCollection(), "formulae");
 #include "formulae"
 	formulae->setItems(defaultFormulae);
 	formulae->setCurrentItem(-1);
@@ -115,42 +115,42 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
 	(void) KStdAction::configureToolbars(this, SLOT(configureToolBars()), actionCollection());
 	(void) KStdAction::keyBindings(this, SLOT(keyBindings()), actionCollection());
 
-	(void) new KAction(i18n("+/-"), "Alt+-", this, SLOT(slotNegative()), actionCollection(), "+/-");
-	(void) new KAction("x!", "Alt+!", this, SLOT(slotFactorial()), actionCollection(), "factorial");
-	(void) new KAction("1/x", "Alt+i", this, SLOT(slotInverse()), actionCollection(), "1/x");
-	(void) new KAction("10^x", 0, this, SLOT(slotRaiseTen()), actionCollection(), "10^x");
-	(void) new KAction("e^x", "Alt+E", this, SLOT(slotRaiseE()), actionCollection(), "e^x");
-	(void) new KAction("Mod", "Alt+M", this, SLOT(slotModulo()), actionCollection(), "modulo");
-	(void) new KAction("Ln", "Alt+L", this, SLOT(slotLn()), actionCollection(), "ln");
-	(void) new KAction("%", "Alt+%", this, SLOT(slotPercent()), actionCollection(), "percent");
-	(void) new KAction("Sqrt", "Alt+R", this, SLOT(slotSqrt()), actionCollection(), "sqrt");
-	(void) new KAction("x^2", "Alt+Shift+S", this, SLOT(slotSquared()), actionCollection(), "x^2");
-	(void) new KAction("y^x", "Alt+^", this, SLOT(slotPower()), actionCollection(), "y^x");
-
-	InvButton = new KToggleAction("Inv", "Ctrl+I", 0, 0, actionCollection(), "inverse");
-	HypButton = new KToggleAction("Hyp", "Ctrl+H", 0, 0, actionCollection(), "hyperbolic");
+	(void) new TDEAction(i18n("+/-"), "Alt+-", this, SLOT(slotNegative()), actionCollection(), "+/-");
+	(void) new TDEAction("x!", "Alt+!", this, SLOT(slotFactorial()), actionCollection(), "factorial");
+	(void) new TDEAction("1/x", "Alt+i", this, SLOT(slotInverse()), actionCollection(), "1/x");
+	(void) new TDEAction("10^x", 0, this, SLOT(slotRaiseTen()), actionCollection(), "10^x");
+	(void) new TDEAction("e^x", "Alt+E", this, SLOT(slotRaiseE()), actionCollection(), "e^x");
+	(void) new TDEAction("Mod", "Alt+M", this, SLOT(slotModulo()), actionCollection(), "modulo");
+	(void) new TDEAction("Ln", "Alt+L", this, SLOT(slotLn()), actionCollection(), "ln");
+	(void) new TDEAction("%", "Alt+%", this, SLOT(slotPercent()), actionCollection(), "percent");
+	(void) new TDEAction("Sqrt", "Alt+R", this, SLOT(slotSqrt()), actionCollection(), "sqrt");
+	(void) new TDEAction("x^2", "Alt+Shift+S", this, SLOT(slotSquared()), actionCollection(), "x^2");
+	(void) new TDEAction("y^x", "Alt+^", this, SLOT(slotPower()), actionCollection(), "y^x");
+
+	InvButton = new TDEToggleAction("Inv", "Ctrl+I", 0, 0, actionCollection(), "inverse");
+	HypButton = new TDEToggleAction("Hyp", "Ctrl+H", 0, 0, actionCollection(), "hyperbolic");
 
 	// bitwise
-	(void) new KAction(i18n("And"), "Alt+A", this, SLOT(slotAnd()), actionCollection(), "bitwise_and");
-	(void) new KAction(i18n("Or"), "Alt+O", this, SLOT(slotOr()), actionCollection(), "bitwise_or");
-	(void) new KAction(i18n("XOr"), "Alt+X", this, SLOT(slotXOr()), actionCollection(), "bitwise_xor");
-	(void) new KAction(i18n("Left Shift"), "back", 0, this, SLOT(slotLsh()), actionCollection(), "bitwise_lsh");
-	(void) new KAction(i18n("Right Shift"), "forward", 0, this, SLOT(slotRsh()), actionCollection(), "bitwise_rsh");
+	(void) new TDEAction(i18n("And"), "Alt+A", this, SLOT(slotAnd()), actionCollection(), "bitwise_and");
+	(void) new TDEAction(i18n("Or"), "Alt+O", this, SLOT(slotOr()), actionCollection(), "bitwise_or");
+	(void) new TDEAction(i18n("XOr"), "Alt+X", this, SLOT(slotXOr()), actionCollection(), "bitwise_xor");
+	(void) new TDEAction(i18n("Left Shift"), "back", 0, this, SLOT(slotLsh()), actionCollection(), "bitwise_lsh");
+	(void) new TDEAction(i18n("Right Shift"), "forward", 0, this, SLOT(slotRsh()), actionCollection(), "bitwise_rsh");
 
 	// trig
-	(void) new KAction("Sin", "Alt+S", this, SLOT(slotSine()), actionCollection(), "sin");
-	(void) new KAction("Cos", "Alt+C", this, SLOT(slotCosine()), actionCollection(), "cos");
-	(void) new KAction("Tan", "Alt+T", this, SLOT(slotTangent()), actionCollection(), "tan");
+	(void) new TDEAction("Sin", "Alt+S", this, SLOT(slotSine()), actionCollection(), "sin");
+	(void) new TDEAction("Cos", "Alt+C", this, SLOT(slotCosine()), actionCollection(), "cos");
+	(void) new TDEAction("Tan", "Alt+T", this, SLOT(slotTangent()), actionCollection(), "tan");
 
 	// edit
-	(void) new KAction(i18n("&Revert Stack Changes"), 0, this, SLOT(slotRevert()), actionCollection(), "revert");
-	(void) new KAction(i18n("&Drop"), 0, this, SLOT(slotDrop()), actionCollection(), "drop");
+	(void) new TDEAction(i18n("&Revert Stack Changes"), 0, this, SLOT(slotRevert()), actionCollection(), "revert");
+	(void) new TDEAction(i18n("&Drop"), 0, this, SLOT(slotDrop()), actionCollection(), "drop");
 
 	statusBar();
 	createGUI();
 
 	resize(430, 500);
-	applyMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+	applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
 
 	// signals and slots connections
 	connect(baseGroup, SIGNAL(activated(int)), this, SLOT(slotBaseChanged(int)));
@@ -221,7 +221,7 @@ Mathemagics::Mathemagics(TQWidget *parent, const char *name, WFlags f)
 	updateStack();
 
 	// load session file
-	openFile(KGlobal::dirs()->saveLocation("appdata") + "session");
+	openFile(TDEGlobal::dirs()->saveLocation("appdata") + "session");
 
 	saveStack();
 
@@ -1074,9 +1074,9 @@ void Mathemagics::closeEvent(TQCloseEvent * /*e*/)
 
 	kapp->config()->sync();
 
-	saveFile(KGlobal::dirs()->saveLocation("appdata") + "session");
+	saveFile(TDEGlobal::dirs()->saveLocation("appdata") + "session");
 
-	saveMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+	saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
 
 	kapp->quit();
 }
@@ -1849,7 +1849,7 @@ void Mathemagics::keyBindings()
 
 void Mathemagics::configureToolBars()
 {
-	saveMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+	saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
 
 	KEditToolbar dlg(actionCollection());
 	connect(&dlg, SIGNAL(newToolbarConfig()), SLOT(newToolBarConfig()));
@@ -1860,13 +1860,13 @@ void Mathemagics::configureToolBars()
 
 void Mathemagics::newToolBarConfig()
 {
-	applyMainWindowSettings(KGlobal::config(), "TopLevelWindow");
+	applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow");
 }
 
 ////////////////////////////////////////////////
 
 EditAction::EditAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name)
-	: KAction(text, accel, parent, name)
+	: TDEAction(text, accel, parent, name)
 {
 	m_receiver = receiver;
 	m_member = member;
@@ -1878,8 +1878,8 @@ EditAction::~EditAction()
 
 int EditAction::plug(TQWidget *w, int index)
 {
-	KToolBar *toolBar = (KToolBar *)w;
-	int id = KAction::getToolButtonID();
+	TDEToolBar *toolBar = (TDEToolBar *)w;
+	int id = TDEAction::getToolButtonID();
 
 	KParanoidLine *comboBox = new KParanoidLine(toolBar, "search edit");
 	toolBar->insertWidget(id, 70, comboBox, index);
@@ -1896,7 +1896,7 @@ int EditAction::plug(TQWidget *w, int index)
 
 void EditAction::unplug(TQWidget *w)
 {
-	KToolBar *toolBar = (KToolBar *)w;
+	TDEToolBar *toolBar = (TDEToolBar *)w;
 	int idx = findContainer(w);
 	toolBar->removeItem(menuId(idx));
 	removeContainer(idx);
@@ -1926,7 +1926,7 @@ TQGuardedPtr<KParanoidLine> EditAction::edit()
 ////////////////////////////////////////////////
 
 ComboAction::ComboAction(const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name)
-	: KAction(text, accel, parent, name)
+	: TDEAction(text, accel, parent, name)
 {
 	m_receiver = receiver;
 	m_member = member;
@@ -1938,9 +1938,9 @@ ComboAction::~ComboAction()
 
 int ComboAction::plug(TQWidget *w, int index)
 {
-	KToolBar *toolBar = (KToolBar *)w;
+	TDEToolBar *toolBar = (TDEToolBar *)w;
 
-	int id = KAction::getToolButtonID();
+	int id = TDEAction::getToolButtonID();
 
 	TQComboBox *comboBox = new TQComboBox(toolBar, "search edit");
 	toolBar->insertWidget(id, 70, comboBox, index);
@@ -1957,7 +1957,7 @@ int ComboAction::plug(TQWidget *w, int index)
 
 void ComboAction::unplug(TQWidget *w)
 {
-	KToolBar *toolBar = (KToolBar *)w;
+	TDEToolBar *toolBar = (TDEToolBar *)w;
 	int idx = findContainer(w);
 	toolBar->removeItem(menuId(idx));
 
diff --git a/mathemagics/mathemagics.desktop b/mathemagics/mathemagics.desktop
index 45bb97f..0daacf3 100644
--- a/mathemagics/mathemagics.desktop
+++ b/mathemagics/mathemagics.desktop
@@ -46,7 +46,7 @@ GenericName[xx]=xxRPN Calculatorxx
 GenericName[zh_CN]=RPN 计算器
 GenericName[zh_TW]=RPN 計算機
 GenericName[zu]=Umshini wokubala we RPN
-DocPath=mathemagics/index.html
+X-DocPath=mathemagics/index.html
 Exec=mathemagics -caption "%c" %i %m
 Name=Mathemagics
 Name[cs]=Matemagie
diff --git a/mathemagics/mathemagics.h b/mathemagics/mathemagics.h
index 52e737c..a332cf5 100644
--- a/mathemagics/mathemagics.h
+++ b/mathemagics/mathemagics.h
@@ -9,8 +9,8 @@
 #include <ntqwidget.h>
 #include <ntqvaluelist.h>
 #include <ntqptrlist.h>
-#include <kmainwindow.h>
-#include <kaction.h>
+#include <tdemainwindow.h>
+#include <tdeaction.h>
 #include <ntqmap.h>
 #include <ntqguardedptr.h>
 
@@ -18,7 +18,7 @@
 #include "optiondialog.h"
 #include "kparanoidline.h"
 
-class KListAction;
+class TDEListAction;
 class EditAction;
 class ComboAction;
 class TQComboBox;
@@ -26,10 +26,10 @@ class TQCloseEvent;
 class TQPushButton;
 class TQVBoxLayout;
 class TQScrollView;
-class KToggleAction;
+class TDEToggleAction;
 class MathKeypad;
 
-class Mathemagics : public KMainWindow
+class Mathemagics : public TDEMainWindow
 {
 	Q_OBJECT
 
@@ -117,9 +117,9 @@ private:
 	EditAction* LineEdit;
 	ComboAction* HistoryBox;
 
-	KListAction *baseGroup;
-	KListAction *angGroup;
-	KListAction *formulae;
+	TDEListAction *baseGroup;
+	TDEListAction *angGroup;
+	TDEListAction *formulae;
 
 	MathKeypad *keypad;
 
@@ -184,9 +184,9 @@ private:
 	int angle;
 	bool beep;
 
-	KToggleAction *keypadAct;
-	KToggleAction *InvButton;
-	KToggleAction *HypButton;
+	TDEToggleAction *keypadAct;
+	TDEToggleAction *InvButton;
+	TDEToggleAction *HypButton;
 
 	// map names to their formulae
 	TQMap<TQString, TQString> formulas;
@@ -199,7 +199,7 @@ private:
 	TQStringList defVariables;
 };
 
-class EditAction : public KAction
+class EditAction : public TDEAction
 {
   Q_OBJECT
 
@@ -226,7 +226,7 @@ private:
     const char *m_member;
 };
 
-class ComboAction : public KAction
+class ComboAction : public TDEAction
 {
   Q_OBJECT
 
diff --git a/mathemagics/optiondialog.cpp b/mathemagics/optiondialog.cpp
index faa3a8a..24be0db 100644
--- a/mathemagics/optiondialog.cpp
+++ b/mathemagics/optiondialog.cpp
@@ -1,6 +1,6 @@
 #include <kapp.h>
-#include <kconfig.h>
-#include <klocale.h>
+#include <tdeconfig.h>
+#include <tdelocale.h>
 
 #include <ntqlayout.h>
 #include <ntqcheckbox.h>
diff --git a/mathemagics/pics/Makefile.in b/mathemagics/pics/Makefile.in
index 859dbb3..babb07a 100644
--- a/mathemagics/pics/Makefile.in
+++ b/mathemagics/pics/Makefile.in
@@ -137,18 +137,18 @@ LIBUTIL = @LIBUTIL@
 LIBZ = @LIBZ@
 LIB_KAB = @LIB_KAB@
 LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
+LIB_TDECORE = @LIB_TDECORE@
+LIB_TDEPIM = @LIB_TDEPIM@
+LIB_TDEPRINT = @LIB_TDEPRINT@
+LIB_TDEUI = @LIB_TDEUI@
 LIB_KFILE = @LIB_KFILE@
 LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
+LIB_TDEHTML = @LIB_TDEHTML@
+LIB_TDEIO = @LIB_TDEIO@
+LIB_TDEPARTS = @LIB_TDEPARTS@
+LIB_TDESPELL = @LIB_TDESPELL@
+LIB_TDESYCOCA = @LIB_TDESYCOCA@
+LIB_TDEUTILS = @LIB_TDEUTILS@
 LIB_POLL = @LIB_POLL@
 LIB_QPE = @LIB_QPE@
 LIB_QT = @LIB_QT@
@@ -255,7 +255,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
diff --git a/mathemagics/stacklevel.cpp b/mathemagics/stacklevel.cpp
index b234eff..ce2cb83 100644
--- a/mathemagics/stacklevel.cpp
+++ b/mathemagics/stacklevel.cpp
@@ -5,7 +5,7 @@
 #include <ntqwhatsthis.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "stacklevel.h"