Initial TDE conversion

author: Slávek Banko <slavek.banko@axis.cz> 2013-08-18 16:27:27 +0200
committer: Slávek Banko <slavek.banko@axis.cz> 2013-08-18 16:27:27 +0200
commit: 679eaaa42746578dde4911d3a9205d4f8670ca55 (patch)
tree: 168d44c78dea3472648384125f2ae28b9ae5bfdf
parent: 0af498ec7d2af08ea8e01b54cc29fae9975b8c91 (diff)
download: kkbswitch-679eaaa42746578dde4911d3a9205d4f8670ca55.tar.gz
kkbswitch-679eaaa42746578dde4911d3a9205d4f8670ca55.zip
31 files changed, 382 insertions, 382 deletions
diff --git a/ChangeLog b/ChangeLog
index 2de9e64..5a97498 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,7 +55,7 @@
   * Bugfix: previously the config dialog failed to set a icon for a layout, for
     which KKBSwitch could not initially guess the icon
   * Added Greek translation (from Stergios Dramis <sdramis@egnatia.ee.auth.gr>)
-  * Set KDEDIR in RPM spec file (fixes reported problems with incorrect
+  * Set TDEDIR in RPM spec file (fixes reported problems with incorrect
      installation from SRPM) 
   * configure option to not install ru_ua layout file (--disable-ru-ua-layout)
 
diff --git a/Doxyfile b/Doxyfile
index 2234625..70b6f75 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = kkbswitch.kdevelop
+PROJECT_NAME           = kkbswitch.tdevelop
 PROJECT_NUMBER         = 0.1
 OUTPUT_DIRECTORY       = 
 OUTPUT_LANGUAGE        = English
diff --git a/Makefile.am b/Makefile.am
index d7cea90..ff46f2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ package-messages:
 	$(MAKE) -C po merge
 
 EXTRA_DIST = admin COPYING configure.in.in Makefile.cvs kkbswitch.1\
-   configure.files Doxyfile kkbswitch.kdevelop kkbswitch.lsm \
+   configure.files Doxyfile kkbswitch.tdevelop kkbswitch.lsm \
    kkbswitch.spec kkbswitch.xpm subdirs kkbswitch.sgml
 
 man_MANS = kkbswitch.1
@@ -26,7 +26,7 @@ KDE_OPTIONS = noautodist
 dist-hook:
 	cd $(top_distdir) && perl admin/am_edit -padmin
 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
-#	rm -f $(distdir)/kkbswitch.kdevelop.pcs
+#	rm -f $(distdir)/kkbswitch.tdevelop.pcs
 #	rm -f $(distdir)/$(PACKAGE)-*.tar.gz
 
 
diff --git a/acinclude.m4 b/acinclude.m4
index 9df64a8..2e8601b 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!
@@ -360,24 +360,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)
@@ -543,11 +543,11 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
 
         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
@@ -559,7 +559,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
           KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
         fi
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+        KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
 
         kde32ornewer=1
@@ -572,14 +572,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 /usr/local/bin /opt/local/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=""
@@ -609,9 +609,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         if test -x "$KDECONFIG"; then # it can be "compiled"
           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`
@@ -693,7 +693,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
@@ -910,7 +910,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
@@ -1394,7 +1394,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
     ])
 
@@ -1435,7 +1435,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
@@ -1619,7 +1619,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
 ])
@@ -1730,16 +1730,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="/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="/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"
@@ -1750,8 +1750,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="/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="/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"
@@ -1769,7 +1769,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
@@ -1924,20 +1924,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");
@@ -1975,7 +1975,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([
@@ -2008,39 +2008,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_KIO, "-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_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
+   AC_SUBST(LIB_KSYCOCA, "-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_KIO, "-ltdeio")
+   AC_SUBST(LIB_KSYCOCA, "-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_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-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
 ])
 
@@ -2105,7 +2105,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
@@ -2386,7 +2386,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
 ])
 
@@ -2450,7 +2450,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
@@ -3066,26 +3066,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
 ])
 
@@ -3102,7 +3102,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
@@ -4076,7 +4076,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)
@@ -4465,8 +4465,8 @@ AC_DEFUN([KDE_CONF_FILES],
 AC_DEFUN([KDE_SET_PREFIX],
 [
   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
@@ -5116,7 +5116,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
@@ -5136,7 +5136,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/aclocal.m4 b/aclocal.m4
index c540a8b..fd09f47 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -35,8 +35,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.
@@ -115,41 +115,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!
@@ -372,24 +372,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)
@@ -555,11 +555,11 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
     AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
 
         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
@@ -571,7 +571,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
           KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
         fi
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+        KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs])
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
 
         kde32ornewer=1
@@ -584,14 +584,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 /usr/local/bin /opt/local/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=""
@@ -621,9 +621,9 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         if test -x "$KDECONFIG"; then # it can be "compiled"
           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`
@@ -705,7 +705,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
@@ -922,7 +922,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
@@ -1406,7 +1406,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
     ])
 
@@ -1447,7 +1447,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
@@ -1631,7 +1631,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
 ])
@@ -1742,16 +1742,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="/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="/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"
@@ -1762,8 +1762,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="/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="/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"
@@ -1781,7 +1781,7 @@ fi
 if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
 AC_MSG_ERROR([
 I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
 fi
 
 if test -n "$kde_widgetdir"; then
@@ -1936,20 +1936,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");
@@ -1987,7 +1987,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([
@@ -2020,39 +2020,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_KIO, "-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_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
+   AC_SUBST(LIB_KSYCOCA, "-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_KIO, "-ltdeio")
+   AC_SUBST(LIB_KSYCOCA, "-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_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-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
 ])
 
@@ -2117,7 +2117,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
@@ -2398,7 +2398,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
 ])
 
@@ -2462,7 +2462,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
@@ -3078,26 +3078,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
 ])
 
@@ -3114,7 +3114,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
@@ -4088,7 +4088,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)
@@ -4477,8 +4477,8 @@ AC_DEFUN([KDE_CONF_FILES],
 AC_DEFUN([KDE_SET_PREFIX],
 [
   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
@@ -5128,7 +5128,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
@@ -5148,7 +5148,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.in b/configure.in
index 98bfc1a..f580c8e 100644
--- a/configure.in
+++ b/configure.in
@@ -80,7 +80,7 @@ AM_CONDITIONAL(ENABLE_RU_UA_LAYOUT, test "x$enable_ru_ua_layout" = "xyes")
 
 dnl set prefix according to installed KDE. Strange that KDE build scripts
 dnl don't do it by default
-AC_PREFIX_DEFAULT(`kde-config --prefix`)
+AC_PREFIX_DEFAULT(`tde-config --prefix`)
 
 KDE_CREATE_SUBDIRSLIST
 AC_CONFIG_FILES([ Makefile ])
diff --git a/configure.in.in b/configure.in.in
index 600ed88..d2b544b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -23,5 +23,5 @@ AM_CONDITIONAL(ENABLE_RU_UA_LAYOUT, test "x$enable_ru_ua_layout" = "xyes")
 
 dnl set prefix according to installed KDE. Strange that KDE build scripts
 dnl don't do it by default
-AC_PREFIX_DEFAULT(`kde-config --prefix`)
+AC_PREFIX_DEFAULT(`tde-config --prefix`)
 
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index b6b09bf..c059822 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -330,7 +330,7 @@ is only for those who want to tweak how this guessing works or just are curious.
 The algorithm is very simple. The &kkbswitch; distribution contains a file named
 <filename>group_names</filename>, which resides in &kkbswitch;'s data directory
 (<filename
- class="directory">$<envar>KDEDIR</envar>/share/apps/kkbswitch</filename>).
+ class="directory">$<envar>TDEDIR</envar>/share/apps/kkbswitch</filename>).
 The file is a standard &kde; config file. It contains two sections. The secion  named "Mapping" contains mappings from XKeyboard group names to country codes.
 It contains various key=value pairs, key being the name of the XKeyboard layout and
 value the two-letter country code of the flag to display. The second section, "Language" contains similar mappings from XKeyboard group names to language codes. Note that if a group name is not found in the "Language" section, it is looked up in "Mapping" section, thus only layouts where country code and language code do not coincide need to be listed in "Language" section (e.g. for US/ASCII group the country code would be "us", but the language code would be "en").
@@ -340,7 +340,7 @@ value the two-letter country code of the flag to display. The second section, "L
 Once the country-code
 has been determined, &kkbswitch; will look for an icon named
 <filename>flag.png</filename> in the directory <filename
-class="directory">$<envar>KDEDIR</envar>/share/locale/l10n/<replaceable>country code</replaceable></filename> for icons styles that feature a flag and use the language code for styles that feature the a language code.
+class="directory">$<envar>TDEDIR</envar>/share/locale/l10n/<replaceable>country code</replaceable></filename> for icons styles that feature a flag and use the language code for styles that feature the a language code.
 </para>
 
 <para>
@@ -562,7 +562,7 @@ url="http://apps.kde.com/">apps.kde.com</ulink>
 <title>Requirements</title>
 <para>
 &kkbswitch; doesn't require any special environment to compile and run besides
- the standard &kde; 2 or 3 kdelibs and kdebase.
+ the standard &kde; 2 or 3 tdelibs and tdebase.
 </para>
 </sect1>
 
@@ -583,7 +583,7 @@ Options you may want or need to give to the <command>configure</command> command
 </para>
 <simplelist>
 <member>
-<option>--prefix</option>=<replaceable>dir</replaceable> - set the prefix where your &kde; installation is located. Alternatively, you can set $<envar>KDEDIR</envar> environment variable to the &kde; directory. Under regular circumstances, the configuration script will find the &kde; location automatically; use this option only if you are having problems without it.
+<option>--prefix</option>=<replaceable>dir</replaceable> - set the prefix where your &kde; installation is located. Alternatively, you can set $<envar>TDEDIR</envar> environment variable to the &kde; directory. Under regular circumstances, the configuration script will find the &kde; location automatically; use this option only if you are having problems without it.
 </member>
 <member>
 <option>--enable-ru-ua-layout</option> - install the Russian/Ukrainian layout file (described in <xref linkend="ru_ua"/>). This option is useful for users of XFree86 prior to version 4.3, who want to use Russian/Ukrainian layout file. Note that with this option it is not possible to install &kkbswitch; without root privileges, because the layout file <emphasis>must</emphasis> go to the system XKB layout directory where ordinary users don't have write access.
diff --git a/kkbswitch.kdevelop b/kkbswitch.kdevelop
index 2129bcd..e328c8d 100644
--- a/kkbswitch.kdevelop
+++ b/kkbswitch.kdevelop
@@ -1,5 +1,5 @@
 <?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
   <general>
     <author>Leonid Zeitlin</author>
     <email>lz@europe.com</email>
@@ -212,4 +212,4 @@
       <usermanualurl/>
     </projectdoc>
   </kdevdocumentation>
-</kdevelop>
+</tdevelop>
diff --git a/kkbswitch.spec b/kkbswitch.spec
index 9a40d59..5dd4984 100644
--- a/kkbswitch.spec
+++ b/kkbswitch.spec
@@ -15,7 +15,7 @@ Url:       http://kkbswitch.sourceforge.net
 Packager:  Leonid Zeitlin <lz@europe.com>
 Group:     User Interface/Desktops
 Source:    kkbswitch-%{version}.tar.gz
-BuildRequires: kdelibs-devel 
+BuildRequires: tdelibs-devel 
 BuildRoot: %{_tmppath}/kkbswitch-root
 
 %description
@@ -31,7 +31,7 @@ still have to configure XKeyboard by editing the XF86Config file.
 %setup
 
 %build
-export KDEDIR=%{_prefix}
+export TDEDIR=%{_prefix}
 # Workaround for legacy auto* tools
 #[ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf
 #[ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5?
@@ -65,9 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/kkbswitch
 %{_datadir}/applnk/Utilities/kkbswitch.desktop
 %{_datadir}/apps/kkbswitch/*
-%{_datadir}/apps/kconf_update/kkbswitch.upd
-%{_datadir}/apps/kconf_update/kkbswitch_update_14_icons
-%{_datadir}/apps/kconf_update/kkbswitch_update_14_options
+%{_datadir}/apps/tdeconf_update/kkbswitch.upd
+%{_datadir}/apps/tdeconf_update/kkbswitch_update_14_icons
+%{_datadir}/apps/tdeconf_update/kkbswitch_update_14_options
 %{_datadir}/locale/*/LC_MESSAGES/kkbswitch.mo
 %{_datadir}/autostart/kkbswitch.desktop
 %{_mandir}/man1/kkbswitch.1*
@@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 - Version 1.4.3
 
 * Sat Nov 13 2004 Leonid Zeitlin <lz@europe.com> 1.4.2-2
-- Added explicit BuildRequires: kdelibs-devel
+- Added explicit BuildRequires: tdelibs-devel
 - Don't use %configure, it causes binary to be named something like 
   i686-redhat-linux-gnu-kkbswitch on older (RH 7.3) systems
 
diff --git a/kkbswitch.upd/Makefile.am b/kkbswitch.upd/Makefile.am
index d2730b3..ff86ddc 100644
--- a/kkbswitch.upd/Makefile.am
+++ b/kkbswitch.upd/Makefile.am
@@ -1,4 +1,4 @@
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_SCRIPTS =  kkbswitch_update_14_icons kkbswitch_update_14_options
 update_DATA =  kkbswitch.upd
diff --git a/kkbswitch/Makefile.am b/kkbswitch/Makefile.am
index f248900..89e1bef 100644
--- a/kkbswitch/Makefile.am
+++ b/kkbswitch/Makefile.am
@@ -7,7 +7,7 @@ kkbswitch_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdl
 
 INCLUDES = $(all_includes)
 
-kkbswitch_LDADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lDCOP
+kkbswitch_LDADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -lDCOP
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot
diff --git a/kkbswitch/Makefile.am.kdeinit b/kkbswitch/Makefile.am.kdeinit
index 75ab6b8..918c856 100644
--- a/kkbswitch/Makefile.am.kdeinit
+++ b/kkbswitch/Makefile.am.kdeinit
@@ -3,13 +3,13 @@ METASOURCES = AUTO
 
 bin_PROGRAMS =  
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kkbswitch.la
+tdeinit_LTLIBRARIES = kkbswitch.la
 kkbswitch_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
 kkbswitch_la_SOURCES = boldlistboxitem.cpp boldmenuitem.cpp kbconfig.cpp kbconfigdlg.cpp kbgroup.cpp kbpickicondlg.cpp kbswitchapp.cpp kbswitchintf.cpp kbswitchtrayicon.cpp main.cpp pathlistboxitem.cpp xkeyboard.cpp kbswitchintf.skel boldlistboxitem.h boldmenuitem.h kbconfigdlg.h kbconfig.h kbgroup.h kbpickicondlg.h kbswitchapp.h kbswitchintf.h kbswitchtrayicon.h pathlistboxitem.h xkeyboard.h windowwatcher.cpp singlewindowwatcher.cpp windowclasswatcher.cpp
 
 INCLUDES = $(all_includes)
 
-kkbswitch_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI)
+kkbswitch_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI)
 
 messages:
 	$(XGETTEXT) *.cpp -o $(podir)/kkbswitch.pot
diff --git a/kkbswitch/boldmenuitem.cpp b/kkbswitch/boldmenuitem.cpp
index 69dee04..e98d3bb 100644
--- a/kkbswitch/boldmenuitem.cpp
+++ b/kkbswitch/boldmenuitem.cpp
@@ -21,10 +21,10 @@
 #include <ntqpalette.h>
 #include <ntqstyle.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <kdeversion.h>
-#if KDE_VERSION_MAJOR >= 3
-  #include <kapplication.h>
+#include <tdeglobalsettings.h>
+#include <tdeversion.h>
+#if TDE_VERSION_MAJOR >= 3
+  #include <tdeapplication.h>
 #else
   #include <kapp.h>
 #endif
@@ -47,14 +47,14 @@ void BoldMenuItem::paint(TQPainter* painter, const TQColorGroup& /*cg*/,
     font.setBold(m_bold);
     painter->setFont(font);
   }
-  //if (act) painter->setPen(KGlobalSettings::highlightedTextColor());
+  //if (act) painter->setPen(TDEGlobalSettings::highlightedTextColor());
   //if (act) painter->setPen(cg.highlightedText());
   if (act) painter->setPen(m_active_text_color);
   kdDebug() << "bg color = " << painter->brush().color().rgb() << endl;
 
   painter->drawText(x, y, w, h, AlignLeft | AlignVCenter | ShowPrefix | DontClip,
     m_text);
-  //KApplication::style().drawItem(painter, TQRect(x, y, w, h), AlignLeft | AlignVCenter | ShowPrefix | DontClip,
+  //TDEApplication::style().drawItem(painter, TQRect(x, y, w, h), AlignLeft | AlignVCenter | ShowPrefix | DontClip,
   //  cg, enabled, 0, m_text);
 }	
 
diff --git a/kkbswitch/kbconfig.cpp b/kkbswitch/kbconfig.cpp
index 41bb6f1..02594af 100644
--- a/kkbswitch/kbconfig.cpp
+++ b/kkbswitch/kbconfig.cpp
@@ -16,17 +16,17 @@
  ***************************************************************************/
 
 #include <config.h> 
-#include <kdeversion.h>
-#include <klocale.h>
-#include <kglobal.h>
-#if KDE_VERSION_MAJOR >= 3
+#include <tdeversion.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#if TDE_VERSION_MAJOR >= 3
   #include <kstandarddirs.h>
-  #include <kapplication.h>
+  #include <tdeapplication.h>
 #else
   #include <kstddirs.h>
   #include <kapp.h>
 #endif
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
 
@@ -58,7 +58,7 @@ KBConfig::KBConfig()
   m_group_scope = SCOPE_GLOBAL;
   m_autostart = true;
   m_icon_style = ICON_CODE_AND_FLAG;
-  //m_keys = new KGlobalAccel(NULL);
+  //m_keys = new TDEGlobalAccel(NULL);
   m_keys = NULL;
 }
 
@@ -67,8 +67,8 @@ KBConfig::~KBConfig()
 	delete m_keys;
 }
 
-/** load the KBSwitch configration from the application KConfig object */
-void KBConfig::load(KConfig *config){
+/** load the KBSwitch configration from the application TDEConfig object */
+void KBConfig::load(TDEConfig *config){
   config->setGroup(OPTIONS_SECTION);
   m_toggle_mode = config->readBoolEntry(TOGGLE_MODE_ENTRY);
   m_default_groupno = config->readNumEntry(DEFAULT_GROUP_ENTRY);
@@ -100,7 +100,7 @@ void KBConfig::load(KConfig *config){
 	}
 
 	if (m_keys) delete m_keys;
-  m_keys = new KGlobalAccel(NULL);
+  m_keys = new TDEGlobalAccel(NULL);
   for (int i = 0; i < groupCount(); i++) {
     m_keys->insert(TQString::fromLatin1("SetGroup %1").arg(i),
       i18n("Activate %1 keyboard layout").arg(m_groups[i]->getName()),
@@ -111,7 +111,7 @@ void KBConfig::load(KConfig *config){
   checkKeysEnabled();
 }
 
-void KBConfig::save(KConfig *config)
+void KBConfig::save(TDEConfig *config)
 {
   config->setGroup(OPTIONS_SECTION);
   config->writeEntry(TOGGLE_MODE_ENTRY, m_toggle_mode);
@@ -130,9 +130,9 @@ void KBConfig::drawIcons(IconStyle icon_style, TQValueVector<TQPixmap> *icons,
   TQString path, countryCode, langCode;
   TQStringList layouts;
   
-  KGlobal::dirs()->addResourceDir("appdata", ".");
-  KConfig map("group_names", true, true, "appdata");
-  KConfig *config = kapp->config();
+  TDEGlobal::dirs()->addResourceDir("appdata", ".");
+  TDEConfig map("group_names", true, true, "appdata");
+  TDEConfig *config = kapp->config();
   config->setGroup(ICONS_SECTION);
   getXkbLayouts(layouts);
 
@@ -163,8 +163,8 @@ void KBConfig::drawIcons(IconStyle icon_style, TQValueVector<TQPixmap> *icons,
 
 /** No descriptions */
 /*void KBConfig::guessGroupPixmaps(){
-  KGlobal::dirs()->addResourceDir("appdata", ".");
-  KConfig map("group_names", true, true, "appdata");
+  TDEGlobal::dirs()->addResourceDir("appdata", ".");
+  TDEConfig map("group_names", true, true, "appdata");
   TQString path, countryCode, langCode;
   TQPixmap pix;
 
@@ -188,7 +188,7 @@ void KBConfig::drawIcons(IconStyle icon_style, TQValueVector<TQPixmap> *icons,
 }*/
 
 bool KBConfig::getGroupImage(TQImage &img, TQString &path, const TQString &code,
-  int group, KConfig *config)
+  int group, TDEConfig *config)
 {
   bool ret = true;
   bool need_to_scale = false;
@@ -217,7 +217,7 @@ bool KBConfig::getGroupImage(TQImage &img, TQString &path, const TQString &code,
 }
 
 void KBConfig::drawFlagPixmap(TQPixmap &pix, TQString &path, const TQString &code,
-  int group, KConfig *config)
+  int group, TDEConfig *config)
 {
   TQImage img;
   if (getGroupImage(img, path, code, group, config)) 
@@ -232,9 +232,9 @@ void KBConfig::drawCodePixmap(TQPixmap &pix, const TQString &code)
   TQFont font("helvetica", 9, TQFont::Bold);
   font.setPixelSize(10);
   painter.setFont(font);
-	painter.setPen(KGlobalSettings::highlightedTextColor());
+	painter.setPen(TDEGlobalSettings::highlightedTextColor());
 	
-	pix.fill(KGlobalSettings::highlightColor());
+	pix.fill(TDEGlobalSettings::highlightColor());
   painter.drawText(1, 0, pix.width(), pix.height(),
     TQt::AlignHCenter | TQt::AlignVCenter, code.upper());
 
@@ -243,13 +243,13 @@ void KBConfig::drawCodePixmap(TQPixmap &pix, const TQString &code)
 }
 
 void KBConfig::drawCodeAndFlagPixmap(TQPixmap &pix, TQString &path,
-  const TQString &countryCode, const TQString &langCode, int group, KConfig *config)
+  const TQString &countryCode, const TQString &langCode, int group, TDEConfig *config)
 {
 	TQImage img;
 	if (!getGroupImage(img, path, countryCode, group, config)) return; // could not find flag
 	if (img.depth() <= 8) img = img.convertDepth(32);
 
-	// the following code is taken from kdebase/kxkb/pixmap.cpp
+	// the following code is taken from tdebase/kxkb/pixmap.cpp
   for (int y = 0; y < img.height(); y++)
     for(int x = 0; x < img.width(); x++) {
       TQRgb rgb = img.pixel(x, y);
@@ -297,7 +297,7 @@ void KBConfig::checkKeysEnabled()
 }*/
 
 /** No descriptions */
-/*void KBConfig::loadConfiguredPixmaps(KConfig *config){
+/*void KBConfig::loadConfiguredPixmaps(TDEConfig *config){
   TQString path;
   TQPixmap pix;
   config->setGroup(ICONS_SECTION);
diff --git a/kkbswitch/kbconfig.h b/kkbswitch/kbconfig.h
index c5ecaac..5ff3936 100644
--- a/kkbswitch/kbconfig.h
+++ b/kkbswitch/kbconfig.h
@@ -22,7 +22,7 @@
 
 #include <ntqptrvector.h>
 #include <ntqvaluevector.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #define ICONS_SECTION "Icons"
 #define OPTIONS_SECTION "Options"
@@ -30,7 +30,7 @@
 #define FLAG_ICON_WIDTH 21
 #define FLAG_ICON_HEIGHT 14
 
-class KGlobalAccel;
+class TDEGlobalAccel;
 
 typedef TQPtrVector<KBGroup> KBGroupVector;
 
@@ -51,7 +51,7 @@ private:
   bool m_autostart;
   bool m_use_shortcuts;
   IconStyle m_icon_style;
-  KGlobalAccel *m_keys;
+  TDEGlobalAccel *m_keys;
 public: 
 	KBConfig();
 	~KBConfig();
@@ -72,11 +72,11 @@ public:
   void set_icon_style(IconStyle value) { m_icon_style = value; }
   bool use_shortcuts() { return m_use_shortcuts; }
   void set_use_shortcuts(bool value) { m_use_shortcuts = value; }
-  KGlobalAccel *keys() { return m_keys; }
-  /** Load the KBSwitch configration from the application KConfig object */
-  void load(KConfig *config);
-  /** Save the KBSwitch configration to the application KConfig object */
-  void save(KConfig *config);
+  TDEGlobalAccel *keys() { return m_keys; }
+  /** Load the KBSwitch configration from the application TDEConfig object */
+  void load(TDEConfig *config);
+  /** Save the KBSwitch configration to the application TDEConfig object */
+  void save(TDEConfig *config);
   /** No descriptions */
   /*void notifyChanged();*/
   /*static TQString entryForGroup(int i) {
@@ -94,16 +94,16 @@ private: // Private methods
   /** No descriptions */
   //void drawDefaultPixmaps();
   /** No descriptions */
-  //void loadConfiguredPixmaps(KConfig *config);
+  //void loadConfiguredPixmaps(TDEConfig *config);
   void drawFlagPixmap(TQPixmap &pix, TQString &path, const TQString &code,
-    int group, KConfig *config);
+    int group, TDEConfig *config);
   void drawCodePixmap(TQPixmap &pix, const TQString &code);
   void drawCodeAndFlagPixmap(TQPixmap &pix, TQString &path,
     const TQString &countryCode, const TQString &langCode, int group,
-    KConfig *config);
+    TDEConfig *config);
   void drawDefaultPixmap(TQPixmap &pix, int group);
   bool getGroupImage(TQImage &img, TQString &path, const TQString &code, int group,
-    KConfig *config);
+    TDEConfig *config);
   void getXkbLayouts(TQStringList &layouts);
 };
 
diff --git a/kkbswitch/kbconfigdlg.cpp b/kkbswitch/kbconfigdlg.cpp
index 3a5b74d..e299aea 100644
--- a/kkbswitch/kbconfigdlg.cpp
+++ b/kkbswitch/kbconfigdlg.cpp
@@ -31,18 +31,18 @@
 #include <ntqpushbutton.h>
 #include <ntqcombobox.h>
 
-#include <kdeversion.h>
-#include <klistbox.h>
-#include <klocale.h>
+#include <tdeversion.h>
+#include <tdelistbox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#if KDE_VERSION_MAJOR >= 3
-  #include <kapplication.h>
+#if TDE_VERSION_MAJOR >= 3
+  #include <tdeapplication.h>
 #else
   #include <kapp.h>
 #endif
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kkeydialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /* This little subclass of KKeyChooser reimplements sizeHint() to
    look a little smaller in our config dialog. The default size
@@ -53,7 +53,7 @@ private:
   TQSize m_size_hint;
   void calcSizeHint();
 public:
-  SmallerKeyChooser(KGlobalAccel *accel, TQWidget *parent) :
+  SmallerKeyChooser(TDEGlobalAccel *accel, TQWidget *parent) :
     KKeyChooser(accel, parent) { calcSizeHint(); }
   virtual TQSize sizeHint() const { return m_size_hint; }
 };
@@ -62,7 +62,7 @@ void SmallerKeyChooser::calcSizeHint()
 {
 	m_size_hint = KKeyChooser::sizeHint();
 
-  KListView *lv = NULL;
+  TDEListView *lv = NULL;
   TQGroupBox *gb = NULL;
   const TQObjectList *objects = children();
   TQObjectListIt iter(*objects);
@@ -70,8 +70,8 @@ void SmallerKeyChooser::calcSizeHint()
 
   while ( (obj = iter.current()) ) {
 		++iter;
-		if (obj->inherits("KListView"))
-		  lv = dynamic_cast<KListView*>(obj);
+		if (obj->inherits("TDEListView"))
+		  lv = dynamic_cast<TDEListView*>(obj);
 		else if (obj->inherits("TQGroupBox"))
 		  gb = dynamic_cast<TQGroupBox*>(obj);  
 	}
@@ -123,7 +123,7 @@ void KBConfigDlg::setupGeneralPage()
   TQHBoxLayout *groupsLayout = new TQHBoxLayout(vlayout);
   groupsLayout->setSpacing(2);
 
-  lbGroups = new KListBox(page);
+  lbGroups = new TDEListBox(page);
   TQObject::connect(lbGroups, SIGNAL(selectionChanged()), this, SLOT(slotLayoutSelected()));
   TQObject::connect(lbGroups, SIGNAL(doubleClicked(TQListBoxItem *)), this,
     SLOT(slotListBoxExecuted(TQListBoxItem *)));
@@ -231,7 +231,7 @@ void KBConfigDlg::setupShortcutsPage()
 void KBConfigDlg::showConfig(){
   int i;
   KBGroup *group;
-  KConfig *conf = kapp->config();
+  TDEConfig *conf = kapp->config();
 
   m_iconpaths.clear();
   conf->setGroup(ICONS_SECTION);
@@ -307,7 +307,7 @@ void KBConfigDlg::slotListBoxExecuted(TQListBoxItem *){
 void KBConfigDlg::saveConfig(){
   TQString path;
   const TQPixmap *pix;
-  KConfig *conf = kapp->config();
+  TDEConfig *conf = kapp->config();
   conf->setGroup(ICONS_SECTION);
   for (int i = 0; i < m_kbconf->groupCount(); i++) {
     path = m_iconpaths[i];
@@ -368,7 +368,7 @@ void KBConfigDlg::redrawIcons(KBConfig::IconStyle icon_style)
 
 void KBConfigDlg::slotCancel()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->rollback();
 	config->reparseConfiguration();
 	KDialogBase::slotCancel();
@@ -397,7 +397,7 @@ void KBConfigDlg::slotSetDefaultIcon()
  */
 void KBConfigDlg::checkIconDefault(int index)
 {
-  KConfig *conf = kapp->config();
+  TDEConfig *conf = kapp->config();
   if (index == -1 || ! iconTypeShowsFlag(KBConfig::IconStyle(cbxIconType->currentItem()))) {
     btnSetDefaultIcon->setEnabled(false);
   }  
diff --git a/kkbswitch/kbconfigdlg.h b/kkbswitch/kbconfigdlg.h
index bead1ad..aa93fef 100644
--- a/kkbswitch/kbconfigdlg.h
+++ b/kkbswitch/kbconfigdlg.h
@@ -40,7 +40,7 @@ public:
 	~KBConfigDlg();
 private: // Private attributes
   /**  */
-  KListBox *lbGroups;
+  TDEListBox *lbGroups;
   /**  */
   TQCheckBox *chkToggleMode;
   //TQCheckBox *chkPerwindowGroup;
diff --git a/kkbswitch/kbpickicondlg.cpp b/kkbswitch/kbpickicondlg.cpp
index c4dc299..b3821ef 100644
--- a/kkbswitch/kbpickicondlg.cpp
+++ b/kkbswitch/kbpickicondlg.cpp
@@ -23,16 +23,16 @@
 #include <ntqpushbutton.h>
 #include <ntqimage.h>
 
-#include <kdeversion.h>
-#include <klocale.h>
-#if KDE_VERSION_MAJOR >= 3
+#include <tdeversion.h>
+#include <tdelocale.h>
+#if TDE_VERSION_MAJOR >= 3
   #include <kstandarddirs.h>
 #else
   #include <kstddirs.h>
 #endif
-#include <kglobal.h>
-#include <kfiledialog.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdefiledialog.h>
+#include <tdemessagebox.h>
 
 #include "kbconfig.h"
 #include "pathlistboxitem.h"
@@ -42,7 +42,7 @@ KBPickIconDlg::KBPickIconDlg(const TQString &currentPath, const TQPixmap &curren
   : KDialogBase(parent, name, true /*modal*/, i18n("Pick an icon") /*caption*/, Ok | Cancel) {
   TQVBox *page = makeVBoxMainWidget();
   
-  lbIcons = new KListBox(page);
+  lbIcons = new TDEListBox(page);
   TQObject::connect(lbIcons, SIGNAL(doubleClicked(TQListBoxItem*)),
     this, SLOT(slotOk()));
   TQObject::connect(lbIcons, SIGNAL(returnPressed(TQListBoxItem*)),
@@ -133,7 +133,7 @@ void KBPickIconDlg::loadCountryFlags()
   TQDir dir;
   TQStringList locales;
   TQString path;
-  TQStringList dirs = KGlobal::dirs()->findDirs("locale", "l10n");
+  TQStringList dirs = TDEGlobal::dirs()->findDirs("locale", "l10n");
   
   for (TQStringList::Iterator dirIter = dirs.begin(); dirIter != dirs.end(); dirIter++) {
     dir.setPath(*dirIter);
@@ -141,7 +141,7 @@ void KBPickIconDlg::loadCountryFlags()
     for (TQStringList::Iterator iter = locales.begin(); iter != locales.end(); iter++) {
       path = dir.path() + "/" + *iter + "/flag.png";
       if (*iter != "." && *iter != ".." && pix.load(path)) {
-				KConfig config(dir.path() + "/" + *iter + "/entry.desktop", true, false,
+				TDEConfig config(dir.path() + "/" + *iter + "/entry.desktop", true, false,
 				  "locale" /*doesn't really matter*/);
         config.setGroup("KCM Locale");
         new PathListBoxItem(lbIcons, pix, config.readEntry("Name"), path);
@@ -166,7 +166,7 @@ void KBPickIconDlg::loadGkbCountryFlags()
       path = info->filePath();
       code = info->baseName();
       if (img.load(path)) {
-				KConfig config("l10n/" + code + "/entry.desktop", true, false, "locale");
+				TDEConfig config("l10n/" + code + "/entry.desktop", true, false, "locale");
 				config.setGroup("KCM Locale");
 				name = config.readEntry("Name");
 				if (!name.isNull()) {
diff --git a/kkbswitch/kbpickicondlg.h b/kkbswitch/kbpickicondlg.h
index 0f5e0f4..fba5cd5 100644
--- a/kkbswitch/kbpickicondlg.h
+++ b/kkbswitch/kbpickicondlg.h
@@ -23,7 +23,7 @@
 class TQWidget;
 class TQStringList;
 class TQPixmap;
-class KListBox;
+class TDEListBox;
 
 /**A dialog to pick an icon for a keyboard layout
   *@author Leonid Zeitlin
@@ -43,8 +43,8 @@ private: // Private attributes
   /**  */
   //TQStringList m_pathnames;
   //TQString m_iconpath;
-  //KIconView *m_iconview;
-  KListBox *lbIcons;
+  //TDEIconView *m_iconview;
+  TDEListBox *lbIcons;
   //TQLabel *lblIcon;
   //TQRadioButton *rbFlags;
   //TQRadioButton *rbBrowse;
diff --git a/kkbswitch/kbswitchapp.cpp b/kkbswitch/kbswitchapp.cpp
index 7798be3..50ce80a 100644
--- a/kkbswitch/kbswitchapp.cpp
+++ b/kkbswitch/kbswitchapp.cpp
@@ -22,13 +22,13 @@
 #include "windowclasswatcher.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kwinmodule.h>
+#include <tdelocale.h>
+#include <twinmodule.h>
 
 KBSwitchApp::KBSwitchApp()
 {
 #ifndef HAVE_LIBXKLAVIER
-  //m_kwin_module = NULL;
+  //m_twin_module = NULL;
   m_watcher = NULL;
 #endif	
 	if (!m_xkb.xkbAvailable()) return; // oops! No XKB in the server
@@ -87,7 +87,7 @@ KBSwitchApp::~KBSwitchApp(){
 bool KBSwitchApp::x11EventFilter(XEvent *e){
   // let m_xkb process the event and emit signals if necessary
   m_xkb.processEvent(e);
-  return KApplication::x11EventFilter(e);
+  return TDEApplication::x11EventFilter(e);
 }
 
 /** Update the tray icon to show the flag corresponding to the current keyboard group */
@@ -295,7 +295,7 @@ void KBSwitchApp::resetWindowMap()
 
   m_window_map.clear();
   
-  if (m_kwin_module && (active_window_id = m_kwin_module->activeWindow())) 
+  if (m_twin_module && (active_window_id = m_twin_module->activeWindow())) 
     addWindowToMap(active_window_id);
   else
     m_active_window = m_window_map.end();
@@ -304,10 +304,10 @@ void KBSwitchApp::resetWindowMap()
 /** Enable window manager notifications */
 /*void KBSwitchApp::enableKWinModule()
 {
-  if (m_kwin_module == NULL) {
-    m_kwin_module = new KWinModule();
-    connect(m_kwin_module, SIGNAL(activeWindowChanged(WId)), SLOT(slotWindowChanged(WId)));
-    connect(m_kwin_module, SIGNAL(windowRemoved(WId)), SLOT(slotWindowRemoved(WId)));
+  if (m_twin_module == NULL) {
+    m_twin_module = new KWinModule();
+    connect(m_twin_module, SIGNAL(activeWindowChanged(WId)), SLOT(slotWindowChanged(WId)));
+    connect(m_twin_module, SIGNAL(windowRemoved(WId)), SLOT(slotWindowRemoved(WId)));
     resetWindowMap();
     if (m_cur_groupno != -1 && m_cur_groupno != m_kbconf.default_groupno())
       setStartGroup(m_kbconf.default_groupno());
@@ -317,10 +317,10 @@ void KBSwitchApp::resetWindowMap()
 /** Disable window manager notifications */
 /*void KBSwitchApp::disableKWinModule()
 {
-  if (m_kwin_module) {
-    m_kwin_module->disconnect();
-    delete m_kwin_module;
-    m_kwin_module = NULL;
+  if (m_twin_module) {
+    m_twin_module->disconnect();
+    delete m_twin_module;
+    m_twin_module = NULL;
     resetWindowMap();
   }
 }*/
diff --git a/kkbswitch/kbswitchapp.h b/kkbswitch/kbswitchapp.h
index f59d120..b730252 100644
--- a/kkbswitch/kbswitchapp.h
+++ b/kkbswitch/kbswitchapp.h
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include <kdeversion.h>
-#if KDE_VERSION_MAJOR >= 3
+#include <tdeversion.h>
+#if TDE_VERSION_MAJOR >= 3
   #include <kuniqueapplication.h>
 #else
   #include <kuniqueapp.h>
@@ -72,7 +72,7 @@ private: // Private attributes
   KBSwitchIntf *m_intf;
 #ifndef HAVE_LIBXKLAVIER  
   /** Window manager interface */
-  //KWinModule *m_kwin_module;
+  //KWinModule *m_twin_module;
   /** Maps Window IDs to their keyboard groups */
   //KBWindowMap m_window_map;
   //KBWindowMap::iterator m_active_window;
diff --git a/kkbswitch/kbswitchtrayicon.cpp b/kkbswitch/kbswitchtrayicon.cpp
index 908875c..335f906 100644
--- a/kkbswitch/kbswitchtrayicon.cpp
+++ b/kkbswitch/kbswitchtrayicon.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kdeversion.h>
+#include <tdeversion.h>
  
 #undef USE_BOLD_MENUITEM
  
@@ -24,37 +24,37 @@
 #ifdef USE_BOLD_MENUITEM
   #include "boldmenuitem.h"
 #endif  
-#include <kpopupmenu.h>
-#if KDE_VERSION_MAJOR >= 3
+#include <tdepopupmenu.h>
+#if TDE_VERSION_MAJOR >= 3
   #include <kstandarddirs.h>
 #else  
   #include <kstddirs.h>
 #endif  
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
-#include <kaction.h>
-#include <kaboutapplication.h>
-#if KDE_VERSION_MAJOR >= 3
-  #include <kapplication.h>
+#include <tdeaction.h>
+#include <tdeaboutapplication.h>
+#if TDE_VERSION_MAJOR >= 3
+  #include <tdeapplication.h>
 #else
   #include <kapp.h>
 #endif
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
 #include <ntqtooltip.h>
 #include <ntqstyle.h>
 #include <ntqpainter.h>
 
 #ifdef USE_BOLD_MENUITEM
-static TQColor getActiveTextColor(KPopupMenu *menu)
+static TQColor getActiveTextColor(TDEPopupMenu *menu)
 {
 	int id = menu->insertItem("test text");
 	TQMenuItem *item = menu->findItem(id);
 	TQStyleOption styleopt = TQStyleOption(item);
 	TQPainter painter(menu);
 	TQColorGroup &cg = menu->colorGroup();
-	KApplication::style().drawControl(TQStyle::CE_PopupMenuItem, &painter, menu,
+	TDEApplication::style().drawControl(TQStyle::CE_PopupMenuItem, &painter, menu,
 	  menu->contentsRect(), cg, TQStyle::Style_Enabled | TQStyle::Style_Active,
 	  styleopt);
 	menu->removeItem(id);
@@ -64,8 +64,8 @@ static TQColor getActiveTextColor(KPopupMenu *menu)
 
 KBSwitchTrayIcon::KBSwitchTrayIcon(KBConfig *conf){
   TQPixmap pix;
-#if KDE_VERSION_MAJOR >= 3
-  KActionCollection *actions = new KActionCollection(this);
+#if TDE_VERSION_MAJOR >= 3
+  TDEActionCollection *actions = new TDEActionCollection(this);
   #define ACTION_PARENT actions
 #else
   #define ACTION_PARENT this
@@ -73,21 +73,21 @@ KBSwitchTrayIcon::KBSwitchTrayIcon(KBConfig *conf){
 
   m_kbconf = conf;
   //TQObject::connect(conf, SIGNAL(changed()), this, SLOT(updateMenuIcons()));
-  KPopupMenu * menu = contextMenu();
+  TDEPopupMenu * menu = contextMenu();
   addLayoutItems(menu, false);
   TQObject::connect(menu, SIGNAL(activated(int)), this, SLOT(slotMenuActivated(int)));
 
   menu->insertSeparator();
-  KAction *pref = KStdAction::preferences(this, SIGNAL(preferencesSelected()), ACTION_PARENT);
+  TDEAction *pref = KStdAction::preferences(this, SIGNAL(preferencesSelected()), ACTION_PARENT);
   pref->plug(menu);
-  KAction *help = KStdAction::help(this, SLOT(slotHelp()), ACTION_PARENT);
+  TDEAction *help = KStdAction::help(this, SLOT(slotHelp()), ACTION_PARENT);
   help->plug(menu);
-  KAction *about = KStdAction::aboutApp(this, SLOT(slotAbout()), ACTION_PARENT);
+  TDEAction *about = KStdAction::aboutApp(this, SLOT(slotAbout()), ACTION_PARENT);
   about->plug(menu);
 
   /*TQString path = locate("icon", "hicolor/16x16/apps/locale.png");
   if (!path.isEmpty()) pix.load(path);*/
-  pix = kapp->iconLoader()->loadIcon("locale", KIcon::Small);
+  pix = kapp->iconLoader()->loadIcon("locale", TDEIcon::Small);
   menu->changeTitle(menu->idAt(0), pix, i18n("Keyboard Switch"));
   setAlignment(TQt::AlignHCenter | TQt::AlignCenter);
 }
@@ -103,7 +103,7 @@ void KBSwitchTrayIcon::slotMenuActivated(int id){
 /** No descriptions */
 void KBSwitchTrayIcon::setActiveGroup(int groupno){
   int i;
-  KPopupMenu *menu = contextMenu();
+  TDEPopupMenu *menu = contextMenu();
   for (i = 0; i < m_kbconf->groupCount(); i++)
     menu->setItemChecked(i, false);
   menu->setItemChecked(groupno, true);
@@ -113,7 +113,7 @@ void KBSwitchTrayIcon::setActiveGroup(int groupno){
 void KBSwitchTrayIcon::setToggleGroups(int group1, int group2){
   int i;
   bool toggling;
-  KPopupMenu *menu = contextMenu();
+  TDEPopupMenu *menu = contextMenu();
 
   for (i = 0; i < m_kbconf->groupCount(); i++) {
     toggling = (i == group1 || i == group2);
@@ -138,20 +138,20 @@ void KBSwitchTrayIcon::mouseReleaseEvent(TQMouseEvent *event){
 
 /** No descriptions */
 void KBSwitchTrayIcon::slotAbout(){
-  KAboutApplication about;
+  TDEAboutApplication about;
   about.exec();
 }
 
 /** No descriptions */
 void KBSwitchTrayIcon::updateMenuIcons(){
-  KPopupMenu *menu = contextMenu();
+  TDEPopupMenu *menu = contextMenu();
   for (int i = 0; i < m_kbconf->groupCount(); i++) {
     menu->changeItem(i, m_kbconf->getGroup(i)->getPixmap(), menu->text(i));
   }
 }
 
 /** No descriptions */
-void KBSwitchTrayIcon::addLayoutItems(KPopupMenu *menu, bool clearOld) {
+void KBSwitchTrayIcon::addLayoutItems(TDEPopupMenu *menu, bool clearOld) {
   KBGroup *group;
   int index;
 #ifdef USE_BOLD_MENUITEM
diff --git a/kkbswitch/kbswitchtrayicon.h b/kkbswitch/kbswitchtrayicon.h
index f9348ad..52f5e20 100644
--- a/kkbswitch/kbswitchtrayicon.h
+++ b/kkbswitch/kbswitchtrayicon.h
@@ -62,7 +62,7 @@ public slots: // Public slots
   void slotUpdateIcons();
 private: // Private methods
   /** No descriptions */
-  void addLayoutItems(KPopupMenu *menu, bool clearOld);
+  void addLayoutItems(TDEPopupMenu *menu, bool clearOld);
   /** No descriptions */
   void updateMenuIcons();
   /** No descriptions */
diff --git a/kkbswitch/kkbswitch.desktop b/kkbswitch/kkbswitch.desktop
index b279abf..021f586 100644
--- a/kkbswitch/kkbswitch.desktop
+++ b/kkbswitch/kkbswitch.desktop
@@ -8,8 +8,8 @@ DocPath=kkbswitch/index.html
 Comment=Keyboard Layout Indicator
 Comment[ru]=Индикатор раскладки клавиатуры
 Comment[uk]=Індикатор розкладки клавіатури
-X-KDE-autostart-after=panel
-X-KDE-autostart-condition=kkbswitchrc:Options:autostart:true
-X-KDE-autostart-phase=2
-X-KDE-StartupNotify=false
-Categories=Qt;KDE;Utility;
+X-TDE-autostart-after=panel
+X-TDE-autostart-condition=kkbswitchrc:Options:autostart:true
+X-TDE-autostart-phase=2
+X-TDE-StartupNotify=false
+Categories=Qt;TDE;Utility;
diff --git a/kkbswitch/main.cpp b/kkbswitch/main.cpp
index d803b4d..aa209fe 100644
--- a/kkbswitch/main.cpp
+++ b/kkbswitch/main.cpp
@@ -15,9 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
-#include <klocale.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 //#include "kkbswitch.h"
@@ -28,7 +28,7 @@ static const char *description =
 // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
 	
 	
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { 0, 0, 0 }
   // INSERT YOUR COMMANDLINE OPTIONS HERE
@@ -38,8 +38,8 @@ static KCmdLineOptions options[] =
 int main(int argc, char *argv[])
 {
 
-  KAboutData aboutData( "kkbswitch", I18N_NOOP("Keyboard Switch"),
-    VERSION, description, KAboutData::License_GPL,
+  TDEAboutData aboutData( "kkbswitch", I18N_NOOP("Keyboard Switch"),
+    VERSION, description, TDEAboutData::License_GPL,
     "(c) 2001-2005 Leonid Zeitlin", 0, 0, "lz@europe.com");
   aboutData.addAuthor("Leonid Zeitlin", I18N_NOOP("Creator and maintainer"), "lz@europe.com");
   aboutData.addCredit("Mikhail Senin", I18N_NOOP("Default group config and per-window groups"),
@@ -50,8 +50,8 @@ int main(int argc, char *argv[])
   aboutData.addCredit("Sergey V Turchin", I18N_NOOP("Autostart patch"),"zerg@altlinux.org");
   aboutData.addCredit("Stergios Dramis", I18N_NOOP("Greek translation"), "sdramis@egnatia.ee.auth.gr");
   aboutData.addCredit("Michal Sulek", I18N_NOOP("Slovak translation"), "reloadshot@atlas.sk");
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
 
   if (!KUniqueApplication::start()) // starting a second instance - just exit
     exit(0);
diff --git a/kkbswitch/singlewindowwatcher.cpp b/kkbswitch/singlewindowwatcher.cpp
index a4b4fa8..8080dc0 100644
--- a/kkbswitch/singlewindowwatcher.cpp
+++ b/kkbswitch/singlewindowwatcher.cpp
@@ -20,7 +20,7 @@
 #include "singlewindowwatcher.h"
 #include "kbconfig.h"
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <kdebug.h>
 
 SingleWindowWatcher::SingleWindowWatcher(KBConfig *kbconf, TQObject *parent, const char *name)
@@ -66,7 +66,7 @@ void SingleWindowWatcher::changeGroup(int groupno, int next_groupno)
 void SingleWindowWatcher::reset()
 {
   m_window_map.clear();
-  WId active_window = m_kwin_module->activeWindow();
+  WId active_window = m_twin_module->activeWindow();
   if (active_window)
     addWindowToMap(active_window);
   else m_active_window = m_window_map.end();
diff --git a/kkbswitch/windowclasswatcher.cpp b/kkbswitch/windowclasswatcher.cpp
index d345a54..74e82ef 100644
--- a/kkbswitch/windowclasswatcher.cpp
+++ b/kkbswitch/windowclasswatcher.cpp
@@ -20,7 +20,7 @@
 #include "windowclasswatcher.h"
 #include "kbconfig.h"
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <kdebug.h>
 
 #include <X11/Xutil.h>
@@ -93,12 +93,12 @@ void WindowClassWatcher::reset()
   m_class_group_map.clear();
 
   // fill the map with existing windows  
-  const TQValueList<WId> windows = m_kwin_module->windows();
+  const TQValueList<WId> windows = m_twin_module->windows();
   const TQValueList<WId>::ConstIterator end = windows.end();
   for (TQValueList<WId>::ConstIterator it = windows.begin(); it != end; ++it)
      windowAdded(*it);
   
-  WId active_window = m_kwin_module->activeWindow();
+  WId active_window = m_twin_module->activeWindow();
   if (active_window) 
     m_active_class = m_class_group_map.find(m_win_class_map[active_window]);
   else m_active_class = m_class_group_map.end();
diff --git a/kkbswitch/windowwatcher.cpp b/kkbswitch/windowwatcher.cpp
index 586ea71..63371dd 100644
--- a/kkbswitch/windowwatcher.cpp
+++ b/kkbswitch/windowwatcher.cpp
@@ -19,16 +19,16 @@
  ***************************************************************************/
 #include "windowwatcher.h"
 
-#include <kwinmodule.h>
+#include <twinmodule.h>
 
 WindowWatcher::WindowWatcher(KBConfig *kbconf, TQObject *parent, const char *name)
  : TQObject(parent, name)
 {
   m_kbconf = kbconf;
-  m_kwin_module = new KWinModule(this);
-  connect(m_kwin_module, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
-  connect(m_kwin_module, SIGNAL(windowRemoved(WId)), SLOT(windowRemoved(WId)));
-  connect(m_kwin_module, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
+  m_twin_module = new KWinModule(this);
+  connect(m_twin_module, SIGNAL(windowAdded(WId)), SLOT(windowAdded(WId)));
+  connect(m_twin_module, SIGNAL(windowRemoved(WId)), SLOT(windowRemoved(WId)));
+  connect(m_twin_module, SIGNAL(activeWindowChanged(WId)), SLOT(activeWindowChanged(WId)));
 }
 
 WindowWatcher::~WindowWatcher()
diff --git a/kkbswitch/windowwatcher.h b/kkbswitch/windowwatcher.h
index 28e59af..6861c5b 100644
--- a/kkbswitch/windowwatcher.h
+++ b/kkbswitch/windowwatcher.h
@@ -36,7 +36,7 @@ class WindowWatcher : public TQObject {
   Q_OBJECT
 protected:
   KBConfig *m_kbconf;
-  KWinModule *m_kwin_module;
+  KWinModule *m_twin_module;
 protected slots:    
   virtual void windowAdded(WId id) = 0;
   virtual void windowRemoved(WId id) = 0;
diff --git a/kkbswitch/xkeyboard.cpp b/kkbswitch/xkeyboard.cpp
index ff3b5cd..de78bc4 100644
--- a/kkbswitch/xkeyboard.cpp
+++ b/kkbswitch/xkeyboard.cpp
@@ -21,7 +21,7 @@
 #include <ntqstringlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 XKeyboard *XKeyboard::m_self = 0;
author	Slávek Banko <slavek.banko@axis.cz>	2013-08-18 16:27:27 +0200
committer	Slávek Banko <slavek.banko@axis.cz>	2013-08-18 16:27:27 +0200
commit	679eaaa42746578dde4911d3a9205d4f8670ca55 (patch)
tree	168d44c78dea3472648384125f2ae28b9ae5bfdf
parent	0af498ec7d2af08ea8e01b54cc29fae9975b8c91 (diff)
download	kkbswitch-679eaaa42746578dde4911d3a9205d4f8670ca55.tar.gz kkbswitch-679eaaa42746578dde4911d3a9205d4f8670ca55.zip