Additional kde to tde renaming

35 files changed, 43 insertions, 43 deletions

diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index 758b03582..418ed1e88 100644
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@ -45,7 +45,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin )
 install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
-##### kwin (kdeinit) ############################
+##### kwin (tdeinit) ############################
 
 set( target kwin )
 
@@ -58,9 +58,9 @@ set( ${target}_SRCS
   geometry.cpp rules.cpp
 )
 
-tde_add_kdeinit_executable( ${target} AUTOMOC
+tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdecorations-shared kdeui-shared Xext
+  LINK tdecorations-shared tdeui-shared Xext
 )
 
 ##### install import cmake modules ###############
diff --git a/kwin/COMPLIANCE b/kwin/COMPLIANCE
index c004b64dd..0940d2b32 100644
--- a/kwin/COMPLIANCE
+++ b/kwin/COMPLIANCE
@@ -12,7 +12,7 @@ compliance with the spec. Some parts also involve the pager and clients which
 this document will cater for as well where applicable.
 
 If you modify the level of NetWM compliance (via modification of kwin/*,
-kdecore/netwm.* or kdecore/kwin.* etc.), or notice any new hints that
+tdecore/netwm.* or tdecore/kwin.* etc.), or notice any new hints that
 were added after version 1.2, please modify this document appropriately.
 Properties are ordered in the table in the order they are found in the 
 specification. To list any important notes regarding a property, just 
@@ -161,7 +161,7 @@ version 2.0
 / 1.2.6.
         Should be checked.
 + 1. (rest of the section)
-+ 2.8. kmanagerselection.* in kdecore
++ 2.8. kmanagerselection.* in tdecore
 + 2. (rest of the section)
         Not a KWin thing.
 *   - patch sent to TT to make TQClipboard sufficiently compliant
diff --git a/kwin/HACKING b/kwin/HACKING
index 1665aea56..f92c0e3fc 100644
--- a/kwin/HACKING
+++ b/kwin/HACKING
@@ -110,7 +110,7 @@ The rest of the files contain additional helper classes:
 - utils.* - various small utility functions/classes
 
 KWin also uses code from kdelibs, specifically files netwm.cpp, netwm.h, netwm_def.h and netwm_p.h
-from kdelibs/kdecore. These files implement support for the EWMH window manager specification,
+from kdelibs/tdecore. These files implement support for the EWMH window manager specification,
 originally called NETWM (hence the filenames).
 
 
diff --git a/kwin/Makefile.am b/kwin/Makefile.am
index 4ac46d385..cedb7e423 100644
--- a/kwin/Makefile.am
+++ b/kwin/Makefile.am
@@ -8,7 +8,7 @@ SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR)
 
 bin_PROGRAMS = 
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kwin.la
+tdeinit_LTLIBRARIES = kwin.la
 
 kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \
 	utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \
diff --git a/kwin/README b/kwin/README
index 30e3e9a15..52a26e079 100644
--- a/kwin/README
+++ b/kwin/README
@@ -116,7 +116,7 @@ was meant for the previously active window.
  The basic principle of focus stealing prevention is that the window with most
 recent user activity wins. Any window of an application will become active
 when being shown only if this application was the most recently used one.
-KWin itself, and some of the related kdecore classes should take care
+KWin itself, and some of the related tdecore classes should take care
 of the common cases, so usually there's no need for any special handling
 in applications. Qt/KDE applications, that is. Applications using other
 toolkits should in most cases work fine too. If they don't support
diff --git a/kwin/clients/PORTING b/kwin/clients/PORTING
index 9a5fb9f6b..f6233beb9 100644
--- a/kwin/clients/PORTING
+++ b/kwin/clients/PORTING
@@ -4,7 +4,7 @@ Also, the API is documented in the .h header files.
 Makefile.am:
 - Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
 - Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
-- Add -lkdecorations to LIBADD.
+- Add -ltdecorations to LIBADD.
 - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ).
 
 .desktop file:
diff --git a/kwin/clients/b2/CMakeLists.txt b/kwin/clients/b2/CMakeLists.txt
index 0031343d7..2395ecc84 100644
--- a/kwin/clients/b2/CMakeLists.txt
+++ b/kwin/clients/b2/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
 
 tde_add_kpart( kwin3_b2 AUTOMOC
   SOURCES b2client.cpp
-  LINK kdecorations-shared
+  LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/b2/config/CMakeLists.txt b/kwin/clients/b2/config/CMakeLists.txt
index c260bc6d0..f319ac8f6 100644
--- a/kwin/clients/b2/config/CMakeLists.txt
+++ b/kwin/clients/b2/config/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_kpart( kwin_b2_config AUTOMOC
   SOURCES config.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/default/CMakeLists.txt b/kwin/clients/default/CMakeLists.txt
index 1f539106c..5ad3d2def 100644
--- a/kwin/clients/default/CMakeLists.txt
+++ b/kwin/clients/default/CMakeLists.txt
@@ -27,6 +27,6 @@ link_directories(
 
 tde_add_kpart( kwin3_default AUTOMOC
   SOURCES kdedefault.cpp
-  LINK kdecorations-shared kdecore-shared
+  LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/default/config/CMakeLists.txt b/kwin/clients/default/config/CMakeLists.txt
index 35492058f..4f6c76835 100644
--- a/kwin/clients/default/config/CMakeLists.txt
+++ b/kwin/clients/default/config/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_kpart( kwin_default_config AUTOMOC
   SOURCES config.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/keramik/CMakeLists.txt b/kwin/clients/keramik/CMakeLists.txt
index 851f44a9a..e4da85e84 100644
--- a/kwin/clients/keramik/CMakeLists.txt
+++ b/kwin/clients/keramik/CMakeLists.txt
@@ -35,7 +35,7 @@ set_source_files_properties( keramik.cpp
 
 tde_add_kpart( kwin3_keramik AUTOMOC
   SOURCES keramik.cpp
-  LINK kdecorations-shared kdeui-shared
+  LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am
index 38f6f51da..8a04fe9e6 100644
--- a/kwin/clients/keramik/Makefile.am
+++ b/kwin/clients/keramik/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS            = tiles.h
 
 embedtool_SOURCES         = embedtool.cpp
 embedtool_LDADD           = $(LIB_QT)
-embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 kde_module_LTLIBRARIES    = kwin3_keramik.la
 
diff --git a/kwin/clients/keramik/config/CMakeLists.txt b/kwin/clients/keramik/config/CMakeLists.txt
index 3d5fb9e03..febfa0d44 100644
--- a/kwin/clients/keramik/config/CMakeLists.txt
+++ b/kwin/clients/keramik/config/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_kpart( kwin_keramik_config AUTOMOC
   SOURCES config.cpp keramikconfig.ui
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/kwmtheme/Makefile.am b/kwin/clients/kwmtheme/Makefile.am
index f6c611180..a3a91080a 100644
--- a/kwin/clients/kwmtheme/Makefile.am
+++ b/kwin/clients/kwmtheme/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kwin3_kwmtheme.la
 
 kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
 kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_kwmtheme_la_LIBADD  = -lkdecorations
+kwin3_kwmtheme_la_LIBADD  = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = kwmthemeclient.h
diff --git a/kwin/clients/kwmtheme/cli_installer/Makefile.am b/kwin/clients/kwmtheme/cli_installer/Makefile.am
index 89b661780..80033222d 100644
--- a/kwin/clients/kwmtheme/cli_installer/Makefile.am
+++ b/kwin/clients/kwmtheme/cli_installer/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = 	kwmtheme
 kwmtheme_SOURCES = main.cpp 
 
 # the library search path. 
-kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kwin/clients/laptop/CMakeLists.txt b/kwin/clients/laptop/CMakeLists.txt
index b6e16e800..e4ae404c5 100644
--- a/kwin/clients/laptop/CMakeLists.txt
+++ b/kwin/clients/laptop/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
 
 tde_add_kpart( kwin3_laptop AUTOMOC
   SOURCES laptopclient.cpp
-  LINK kdecorations-shared
+  LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/modernsystem/CMakeLists.txt b/kwin/clients/modernsystem/CMakeLists.txt
index 8fbfec858..723ddffe1 100644
--- a/kwin/clients/modernsystem/CMakeLists.txt
+++ b/kwin/clients/modernsystem/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
 
 tde_add_kpart( kwin3_modernsys
   SOURCES modernsys.cpp
-  LINK kdecorations-shared
+  LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/modernsystem/config/CMakeLists.txt b/kwin/clients/modernsystem/config/CMakeLists.txt
index 7e644f0c9..e2468db33 100644
--- a/kwin/clients/modernsystem/config/CMakeLists.txt
+++ b/kwin/clients/modernsystem/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 tde_add_kpart( kwin_modernsys_config AUTOMOC
   SOURCES config.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kwin/clients/plastik/CMakeLists.txt b/kwin/clients/plastik/CMakeLists.txt
index da88e2ffa..cc9aaa347 100644
--- a/kwin/clients/plastik/CMakeLists.txt
+++ b/kwin/clients/plastik/CMakeLists.txt
@@ -34,6 +34,6 @@ install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
 
 tde_add_kpart( kwin3_plastik AUTOMOC
   SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
-  LINK kdecorations-shared kdeui-shared
+  LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/plastik/config/CMakeLists.txt b/kwin/clients/plastik/config/CMakeLists.txt
index c5b34f368..4e3c2ac2b 100644
--- a/kwin/clients/plastik/config/CMakeLists.txt
+++ b/kwin/clients/plastik/config/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES  DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kwin_plastik_config AUTOMOC
   SOURCES config.cpp configdialog.ui
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/quartz/CMakeLists.txt b/kwin/clients/quartz/CMakeLists.txt
index a4463067a..160a3cd52 100644
--- a/kwin/clients/quartz/CMakeLists.txt
+++ b/kwin/clients/quartz/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
 
 tde_add_kpart( kwin3_quartz AUTOMOC
   SOURCES quartz.cpp
-  LINK kdecorations-shared kdeui-shared
+  LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/quartz/config/CMakeLists.txt b/kwin/clients/quartz/config/CMakeLists.txt
index 3b3ed6564..3142505c7 100644
--- a/kwin/clients/quartz/config/CMakeLists.txt
+++ b/kwin/clients/quartz/config/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_kpart( kwin_quartz_config AUTOMOC
   SOURCES config.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/redmond/CMakeLists.txt b/kwin/clients/redmond/CMakeLists.txt
index 8a3bc7814..5be11e2f9 100644
--- a/kwin/clients/redmond/CMakeLists.txt
+++ b/kwin/clients/redmond/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
 
 tde_add_kpart( kwin3_redmond AUTOMOC
   SOURCES redmond.cpp
-  LINK kdecorations-shared kdecore-shared
+  LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/clients/web/CMakeLists.txt b/kwin/clients/web/CMakeLists.txt
index 9bb7de57f..6a6d1088d 100644
--- a/kwin/clients/web/CMakeLists.txt
+++ b/kwin/clients/web/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
 
 tde_add_kpart( kwin3_web AUTOMOC
   SOURCES Web.cpp WebButton.cpp
-  LINK kdecorations-shared kdeui-shared
+  LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/data/CMakeLists.txt b/kwin/data/CMakeLists.txt
index ac9d78e1c..832a71cfd 100644
--- a/kwin/data/CMakeLists.txt
+++ b/kwin/data/CMakeLists.txt
@@ -44,7 +44,7 @@ install( FILES
 
 tde_add_executable( kwin_update_window_settings
   SOURCES update_window_settings.cpp
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
 )
 
@@ -53,6 +53,6 @@ tde_add_executable( kwin_update_window_settings
 
 tde_add_executable( kwin_update_default_rules
   SOURCES update_default_rules.cpp
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
 )
diff --git a/kwin/kcmkwin/kwindecoration/CMakeLists.txt b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
index 21cfa02c8..1d88ce5a9 100644
--- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt
+++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt
@@ -32,6 +32,6 @@ tde_add_kpart( kcm_kwindecoration AUTOMOC
   SOURCES
     kwindecoration.cpp buttons.cpp
     kwindecorationIface.skel preview.cpp
-  LINK kdecorations-shared kdeui-shared Xext
+  LINK tdecorations-shared tdeui-shared Xext
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/kcmkwin/kwinoptions/CMakeLists.txt b/kwin/kcmkwin/kwinoptions/CMakeLists.txt
index 21a8648ea..b3caf6ec0 100644
--- a/kwin/kcmkwin/kwinoptions/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinoptions/CMakeLists.txt
@@ -35,6 +35,6 @@ install( FILES
 
 tde_add_kpart( kcm_kwinoptions AUTOMOC
   SOURCES windows.cpp mouse.cpp main.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt
index 93acbe2e8..d505cf709 100644
--- a/kwin/kcmkwin/kwinrules/CMakeLists.txt
+++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt
@@ -35,9 +35,9 @@ tde_add_kpart( kcm_kwinrules AUTOMOC
   DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
-##### kwin_rules_dialog (kdeinit) ###############
+##### kwin_rules_dialog (tdeinit) ###############
 
-tde_add_kdeinit_executable( kwin_rules_dialog
+tde_add_tdeinit_executable( kwin_rules_dialog
   SOURCES main.cpp
   LINK ${TQT_LIBRARIES} kwinrules-static )
 
@@ -53,4 +53,4 @@ set( ${target}_SRCS
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kdeui-shared )
+  LINK tdeui-shared )
diff --git a/kwin/kcmkwin/kwinrules/Makefile.am b/kwin/kcmkwin/kwinrules/Makefile.am
index 18aef9ccd..b4769c6bd 100644
--- a/kwin/kcmkwin/kwinrules/Makefile.am
+++ b/kwin/kcmkwin/kwinrules/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kwin/lib
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kwin_rules_dialog.la
+tdeinit_LTLIBRARIES = kwin_rules_dialog.la
 kde_module_LTLIBRARIES = kcm_kwinrules.la 
 noinst_LTLIBRARIES = libkwinrules.la
 
diff --git a/kwin/killer/CMakeLists.txt b/kwin/killer/CMakeLists.txt
index 71c349c7c..4fd991d40 100644
--- a/kwin/killer/CMakeLists.txt
+++ b/kwin/killer/CMakeLists.txt
@@ -23,6 +23,6 @@ link_directories(
 
 tde_add_executable( kwin_killer_helper
   SOURCES killer.cpp
-  LINK kdeui-shared
+  LINK tdeui-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kwin/killer/Makefile.am b/kwin/killer/Makefile.am
index e31c88be6..620543fa0 100644
--- a/kwin/killer/Makefile.am
+++ b/kwin/killer/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = kwin_killer_helper
 
 kwin_killer_helper_SOURCES = killer.cpp
 kwin_killer_helper_LDADD = $(LIB_KDEUI)
-kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
diff --git a/kwin/lib/CMakeLists.txt b/kwin/lib/CMakeLists.txt
index b97e3d455..26f0809af 100644
--- a/kwin/lib/CMakeLists.txt
+++ b/kwin/lib/CMakeLists.txt
@@ -21,9 +21,9 @@ link_directories(
 )
 
 
-##### kdecorations (shared) #####################
+##### tdecorations (shared) #####################
 
-set( target kdecorations )
+set( target tdecorations )
 
 set( ${target}_SRCS
   kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp
@@ -33,7 +33,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kdecore-shared
+  LINK tdecore-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kwin/rules.cpp b/kwin/rules.cpp
index 2d6ddded7..41489e3cd 100644
--- a/kwin/rules.cpp
+++ b/kwin/rules.cpp
@@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app )
     args << "--wid" << TQString::number( c->window());
     if( whole_app )
         args << "--whole-app";
-    KApplication::kdeinitExec( "kwin_rules_dialog", args );
+    KApplication::tdeinitExec( "kwin_rules_dialog", args );
     }
 
 void Workspace::loadWindowRules()
diff --git a/kwin/tools/Makefile.am b/kwin/tools/Makefile.am
index 444cde9dc..8d223282a 100644
--- a/kwin/tools/Makefile.am
+++ b/kwin/tools/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = decobenchmark
 INCLUDES = $(all_includes)
 
 test_gravity_SOURCES = test_gravity.cpp
-test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 test_gravity_LDADD = $(LIB_X11)
 
 METASOURCES = AUTO
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index 66b8780ec..06b8bdc8a 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -1219,7 +1219,7 @@ TQStringList Workspace::configModules(bool controlCenter)
 
 void Workspace::configureWM()
     {
-    KApplication::kdeinitExec( "kcmshell", configModules(false) );
+    KApplication::tdeinitExec( "kcmshell", configModules(false) );
     }
 
 /*!