Rename a number of libraries and executables to avoid conflicts with KDE4

54 files changed, 63 insertions, 63 deletions

diff --git a/twin/CONFIGURING b/twin/CONFIGURING
index 01b6696a5..071f9d6dc 100644
--- a/twin/CONFIGURING
+++ b/twin/CONFIGURING
@@ -48,7 +48,7 @@ these steps:
  (e.g. foobar_fix_maxsize in this example case)
 - Be careful with manual modifications of the file, especially make sure the count=
  field in the [General] group is updated if needed
-- Create a file for kconfig_update like this (named twin_foobar_fix_maxsize.upd
+- Create a file for tdeconfig_update like this (named twin_foobar_fix_maxsize.upd
  in this example):
 
 # twin_foobar_fix_maxsize.upd start # 
@@ -61,8 +61,8 @@ Script=twin_update_default_rules
 
 # twin_foobar_fix_maxsize.upd end # 
 
-- The kconfig_file (twin_foobar_fix_maxsize.upd) is to be placed
- in $TDEDIR/share/apps/kconf_update/
+- The tdeconfig_file (twin_foobar_fix_maxsize.upd) is to be placed
+ in $TDEDIR/share/apps/tdeconf_update/
 - The file with the window-specific settings (foobar_fix_maxsize) is to be placed
  in $TDEDIR/share/apps/twin/default_rules/
 
diff --git a/twin/README b/twin/README
index 652fa83ae..8d61c7163 100644
--- a/twin/README
+++ b/twin/README
@@ -160,7 +160,7 @@ mainwindow should in the cookie dialog case point to the Konqueror window
 for which it has been shown. This is solved in kcookiejar by including
 the window id in the DCOP call. When the cookie dialog is shown, its
 WM_TRANSIENT_FOR property is manually set using the XSetTransientForHint()
-call (see tdelibs/kioslave/http/kcookiejar/kcookiewin.cpp). The arguments
+call (see tdelibs/tdeioslave/http/kcookiejar/kcookiewin.cpp). The arguments
 to XSetTransientForHint() call are the X display (i.e. qt_xdisplay()),
 the window id on which the WM_TRANSIENT_FOR property is to be set
 (i.e. use QWidget::winId()), and the window id of the mainwindow.
diff --git a/twin/activation.cpp b/twin/activation.cpp
index f54b37232..c2c910818 100644
--- a/twin/activation.cpp
+++ b/twin/activation.cpp
@@ -293,7 +293,7 @@ void Workspace::activateClient( Client* c, bool force )
     // As they usually belong to the current active window but fail to provide
     // this information, updating their user time would make the user time
     // of the currently active window old, and reject further activation for it.
-    // E.g. typing URL in minicli which will show kio_uiserver dialog (with workaround),
+    // E.g. typing URL in minicli which will show tdeio_uiserver dialog (with workaround),
     // and then kdesktop shows dialog about SSL certificate.
     // This needs also avoiding user creation time in Client::readUserTimeMapTimestamp().
     if( !c->ignoreFocusStealing())
diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 4e174cf44..71d6fdfdd 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -20,7 +20,7 @@
 #include <kiconeffect.h>
 #include <kdrawutil.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqbitmap.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
diff --git a/twin/clients/b2/config/config.h b/twin/clients/b2/config/config.h
index 53bd42767..a1ca8ebdd 100644
--- a/twin/clients/b2/config/config.h
+++ b/twin/clients/b2/config/config.h
@@ -14,7 +14,7 @@
 #include <tqhgroupbox.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class B2Config: public TQObject
 {
diff --git a/twin/clients/default/config/config.h b/twin/clients/default/config/config.h
index fcd9fbf23..a09ac1ab3 100644
--- a/twin/clients/default/config/config.h
+++ b/twin/clients/default/config/config.h
@@ -12,7 +12,7 @@
 
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 52fff00f3..938a9e06d 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -12,7 +12,7 @@
 
 #include "kdedefault.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
diff --git a/twin/clients/keramik/config/CMakeLists.txt b/twin/clients/keramik/config/CMakeLists.txt
index 7b5bdb339..6fce6dfaf 100644
--- a/twin/clients/keramik/config/CMakeLists.txt
+++ b/twin/clients/keramik/config/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### twin_keramik_config (module) ##############
 
 tde_add_kpart( twin_keramik_config AUTOMOC
-  SOURCES config.cpp keramikconfig.ui
+  SOURCES config.cpp keramitdeconfig.ui
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/twin/clients/keramik/config/Makefile.am b/twin/clients/keramik/config/Makefile.am
index 19ee4f27d..aa6014cf5 100644
--- a/twin/clients/keramik/config/Makefile.am
+++ b/twin/clients/keramik/config/Makefile.am
@@ -2,12 +2,12 @@ INCLUDES                       = $(all_includes)
 
 kde_module_LTLIBRARIES         = twin_keramik_config.la
 
-twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
+twin_keramik_config_la_SOURCES = config.cpp keramitdeconfig.ui
 twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 twin_keramik_config_la_LIBADD  = $(LIB_TDEUI)
 
 METASOURCES                    = AUTO
-noinst_HEADERS                 = config.h keramikconfig.h
+noinst_HEADERS                 = config.h keramitdeconfig.h
 
 lnkdir                         = $(kde_datadir)/twin
 
diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h
index 4138fe958..7907f28e5 100644
--- a/twin/clients/keramik/config/config.h
+++ b/twin/clients/keramik/config/config.h
@@ -25,9 +25,9 @@
 #ifndef __KWIN_KERAMIK_CONFIG_H
 #define __KWIN_KERAMIK_CONFIG_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
-#include "keramikconfig.h"
+#include "keramitdeconfig.h"
 
 class KeramikConfig: public TQObject
 {
diff --git a/twin/clients/keramik/config/keramikconfig.ui b/twin/clients/keramik/config/keramitdeconfig.ui
index dda8d5b5f..dda8d5b5f 100644
--- a/twin/clients/keramik/config/keramikconfig.ui
+++ b/twin/clients/keramik/config/keramitdeconfig.ui
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 3825a851a..d90291ad2 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index 33b71994e..d2bf002ed 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,4 +1,4 @@
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "kwmthemeclient.h"
 #include <kglobal.h>
 #include <tqlayout.h>
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 58d54a118..0f91d9005 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -6,7 +6,7 @@
  * Copyright (c) 2003 Luciano Montanaro <mikelima@cirulla.net>
  */
 
-#include <kconfig.h> // up here to avoid X11 header conflict :P
+#include <tdeconfig.h> // up here to avoid X11 header conflict :P
 #include "laptopclient.h"
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 4c87829be..8eefe484d 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -1,7 +1,7 @@
 // Melchior FRANZ  <mfranz@kde.org>	-- 2001-04-22
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kglobal.h>
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index 8fbd1e38c..f58855fe3 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -1,7 +1,7 @@
 // Daniel M. DULEY <mosfet@kde.org>               original work
 // Melchior FRANZ  <a8603365@unet.univie.ac.at>   configuration options
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tqlayout.h>
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index d79800d4a..4477fdd02 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -27,7 +27,7 @@
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index 2072302d7..5e03b7a51 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpixmap.h>
 #include <kpixmapeffect.h>
 
diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h
index d334930c8..f68b9ef27 100644
--- a/twin/clients/quartz/config/config.h
+++ b/twin/clients/quartz/config/config.h
@@ -12,7 +12,7 @@
 
 #include <tqcheckbox.h>
 #include <tqvbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class QuartzConfig: public TQObject
 {
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 09d3ccf52..00aee9c58 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -14,7 +14,7 @@
  *
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdrawutil.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 94bf98f35..53ec5a4df 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -22,7 +22,7 @@
 
 #include <tqpainter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "Web.h"
 #include "WebButton.h"
diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index 808d65e06..9a0ce88da 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -45,7 +45,7 @@ install( FILES
 tde_add_executable( twin_update_window_settings
   SOURCES update_window_settings.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
 
 
@@ -54,5 +54,5 @@ tde_add_executable( twin_update_window_settings
 tde_add_executable( twin_update_default_rules
   SOURCES update_default_rules.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am
index 81bc0db43..0a2dab482 100644
--- a/twin/data/Makefile.am
+++ b/twin/data/Makefile.am
@@ -1,5 +1,5 @@
-kconf_PROGRAMS = twin_update_window_settings twin_update_default_rules
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = twin_update_window_settings twin_update_default_rules
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 twin_update_window_settings_SOURCES = update_window_settings.cpp
 twin_update_window_settings_LDADD   = $(LIB_TDECORE) $(KDE_RPATH)
@@ -19,7 +19,7 @@ sound_DATA = pop.wav
 update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
         twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
 update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 twin_default_rules_DATA = fsp_workarounds_1.twinrules
 twin_default_rulesdir = $(kde_datadir)/twin/default_rules
diff --git a/twin/data/twin_focus1.sh b/twin/data/twin_focus1.sh
index 6ffe0e039..afb05acac 100644
--- a/twin/data/twin_focus1.sh
+++ b/twin/data/twin_focus1.sh
@@ -2,12 +2,12 @@
 was=
 while read line; do
     if echo "$line" | grep '^IgnoreFocusStealingClasses=' >/dev/null 2>/dev/null; then
-        echo "$line" | sed 's/\(^IgnoreFocusStealingClasses=.*$\)/\1,kio_uiserver/'
+        echo "$line" | sed 's/\(^IgnoreFocusStealingClasses=.*$\)/\1,tdeio_uiserver/'
         was=1
     else
         echo "$line"
     fi
 done
 if test -z "$was"; then
-    echo "IgnoreFocusStealingClasses=kio_uiserver"
+    echo "IgnoreFocusStealingClasses=tdeio_uiserver"
 fi
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index 61b03d3c4..1afde0bee 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // read addtional window rules and add them to twinrulesrc
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp
index 40b25db9c..e52f8c760 100644
--- a/twin/data/update_window_settings.cpp
+++ b/twin/data/update_window_settings.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // updates per-window settings from KDE3.2 to KDE3.3
 
 #include <netwm_def.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <dcopclient.h>
 
diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp
index 8c12f9048..238bb2498 100644
--- a/twin/kcmtwin/twindecoration/preview.cpp
+++ b/twin/kcmtwin/twindecoration/preview.cpp
@@ -21,7 +21,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
diff --git a/twin/kcmtwin/twindecoration/twindecoration.desktop b/twin/kcmtwin/twindecoration/twindecoration.desktop
index cc9c29084..f036b36ab 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.desktop
+++ b/twin/kcmtwin/twindecoration/twindecoration.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell twindecoration
+Exec=tdecmshell twindecoration
 Icon=kcmkwm
 Type=Application
 DocPath=kcontrol/twindecoration/index.html
diff --git a/twin/kcmtwin/twindecoration/twindecoration.h b/twin/kcmtwin/twindecoration/twindecoration.h
index 49af27d71..cf968df1d 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.h
+++ b/twin/kcmtwin/twindecoration/twindecoration.h
@@ -33,7 +33,7 @@
 #include <tdecmodule.h>
 #include <dcopobject.h>
 #include <buttons.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klibloader.h>
 
diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp
index 0743ca31f..aac2436d1 100644
--- a/twin/kcmtwin/twinoptions/main.cpp
+++ b/twin/kcmtwin/twinoptions/main.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <kaboutdata.h>
 #include <kdialog.h>
diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp
index 5c1e22d35..41a635c51 100644
--- a/twin/kcmtwin/twinoptions/mouse.cpp
+++ b/twin/kcmtwin/twinoptions/mouse.cpp
@@ -31,7 +31,7 @@
 #include <dcopclient.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kseparator.h>
diff --git a/twin/kcmtwin/twinoptions/twinactions.desktop b/twin/kcmtwin/twinoptions/twinactions.desktop
index bde13343d..b6cacad48 100644
--- a/twin/kcmtwin/twinoptions/twinactions.desktop
+++ b/twin/kcmtwin/twinoptions/twinactions.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinactions
+Exec=tdecmshell twinactions
 DocPath=kcontrol/windowmanagement/index.html#action-actions
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinadvanced.desktop b/twin/kcmtwin/twinoptions/twinadvanced.desktop
index 529a806c6..1929d330f 100644
--- a/twin/kcmtwin/twinoptions/twinadvanced.desktop
+++ b/twin/kcmtwin/twinoptions/twinadvanced.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinadvanced
+Exec=tdecmshell twinadvanced
 DocPath=kcontrol/windowmanagement/index.html#action-advanced
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinfocus.desktop b/twin/kcmtwin/twinoptions/twinfocus.desktop
index 5db9181e1..530d09206 100644
--- a/twin/kcmtwin/twinoptions/twinfocus.desktop
+++ b/twin/kcmtwin/twinoptions/twinfocus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinfocus
+Exec=tdecmshell twinfocus
 DocPath=kcontrol/windowmanagement/index.html#action-focus
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinmoving.desktop b/twin/kcmtwin/twinoptions/twinmoving.desktop
index 1845b682e..144406d97 100644
--- a/twin/kcmtwin/twinoptions/twinmoving.desktop
+++ b/twin/kcmtwin/twinoptions/twinmoving.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinmoving
+Exec=tdecmshell twinmoving
 DocPath=kcontrol/windowmanagement/index.html#action-moving
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twinoptions.desktop b/twin/kcmtwin/twinoptions/twinoptions.desktop
index 2f1eab87c..1fc2e1a95 100644
--- a/twin/kcmtwin/twinoptions/twinoptions.desktop
+++ b/twin/kcmtwin/twinoptions/twinoptions.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinoptions
+Exec=tdecmshell twinoptions
 DocPath=kcontrol/windowmanagement/index.html
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/twintranslucency.desktop b/twin/kcmtwin/twinoptions/twintranslucency.desktop
index 164fe8d7a..3ff002dac 100644
--- a/twin/kcmtwin/twinoptions/twintranslucency.desktop
+++ b/twin/kcmtwin/twinoptions/twintranslucency.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twintranslucency
+Exec=tdecmshell twintranslucency
 DocPath=kcontrol/windowmanagement/index.html#action-translucency
 
 X-TDE-ModuleType=Library
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 41a593388..991b425b6 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -37,7 +37,7 @@
 #include <kactivelabel.h>
 #include <klocale.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kapplication.h>
 #include <kdialog.h>
diff --git a/twin/kcmtwin/twinrules/kcm.h b/twin/kcmtwin/twinrules/kcm.h
index 33d7c2664..5e89a7773 100644
--- a/twin/kcmtwin/twinrules/kcm.h
+++ b/twin/kcmtwin/twinrules/kcm.h
@@ -21,7 +21,7 @@
 #define __KCM_H__
 
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfig;
 class TDEAboutData;
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index 4b36bd795..78bec0302 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -19,7 +19,7 @@
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <twin.h>
 
diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp
index c7634c3ac..2f7c4582a 100644
--- a/twin/kcmtwin/twinrules/ruleslist.cpp
+++ b/twin/kcmtwin/twinrules/ruleslist.cpp
@@ -22,7 +22,7 @@
 #include <kpushbutton.h>
 #include <assert.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "ruleswidget.h"
 
diff --git a/twin/kcmtwin/twinrules/twinrules.desktop b/twin/kcmtwin/twinrules/twinrules.desktop
index eba872171..061609041 100644
--- a/twin/kcmtwin/twinrules/twinrules.desktop
+++ b/twin/kcmtwin/twinrules/twinrules.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkwm
 Type=Application
-Exec=kcmshell twinrules
+Exec=tdecmshell twinrules
 DocPath=kcontrol/windowmanagement/index.html
 
 X-TDE-ModuleType=Library
diff --git a/twin/lib/kdecoration_p.cpp b/twin/lib/kdecoration_p.cpp
index 66d886aec..73e2d9871 100644
--- a/twin/lib/kdecoration_p.cpp
+++ b/twin/lib/kdecoration_p.cpp
@@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kdecoration_p.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <tqpalette.h>
 #include <tqapplication.h>
diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp
index e6c6cfe36..632539f66 100644
--- a/twin/lib/kdecoration_plugins_p.cpp
+++ b/twin/lib/kdecoration_plugins_p.cpp
@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include "kdecoration_plugins_p.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <klibloader.h>
diff --git a/twin/main.cpp b/twin/main.cpp
index e9474d4f9..b21540db0 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -10,7 +10,7 @@ License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
 //#define QT_CLEAN_NAMESPACE
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "main.h"
 
diff --git a/twin/options.cpp b/twin/options.cpp
index d1dc123c5..25bcb6a33 100644
--- a/twin/options.cpp
+++ b/twin/options.cpp
@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqpalette.h>
 #include <tqpixmap.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <tqtooltip.h>
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp
index e047981cc..3f5aa4d90 100644
--- a/twin/popupinfo.cpp
+++ b/twin/popupinfo.cpp
@@ -20,7 +20,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqstyle.h>
 #include <kglobal.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqapplication.h>
diff --git a/twin/rules.cpp b/twin/rules.cpp
index 6f2b3b615..c9eba17ac 100644
--- a/twin/rules.cpp
+++ b/twin/rules.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "rules.h"
 
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqregexp.h>
 #include <ktempfile.h>
 #include <ksimpleconfig.h>
diff --git a/twin/sm.cpp b/twin/sm.cpp
index af8217bfb..0ce286fdd 100644
--- a/twin/sm.cpp
+++ b/twin/sm.cpp
@@ -18,7 +18,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <stdlib.h>
 #include <pwd.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "workspace.h"
@@ -101,7 +101,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase )
             config->writeEntry( TQString("fullscreen")+n, (int) c->fullScreenMode() );
             config->writeEntry( TQString("desktop")+n, c->desktop() );
     	    // the config entry is called "iconified" for back. comp. reasons
-            // (kconf_update script for updating session files would be too complicated)
+            // (tdeconf_update script for updating session files would be too complicated)
             config->writeEntry( TQString("iconified")+n, c->isMinimized() );
             // the config entry is called "sticky" for back. comp. reasons
             config->writeEntry( TQString("sticky")+n, c->isOnAllDesktops() );
diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp
index de5006903..85da5a7be 100644
--- a/twin/tabbox.cpp
+++ b/twin/tabbox.cpp
@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <tqstyle.h>
 #include <kglobal.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <tqapplication.h>
 #include <tqdesktopwidget.h>
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index db625ba15..e69ce5932 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -21,7 +21,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdecoration_plugins_p.h>
 #include <kdecorationfactory.h>
 
diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp
index ece91c734..b6bc6691f 100644
--- a/twin/tools/decobenchmark/preview.cpp
+++ b/twin/tools/decobenchmark/preview.cpp
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqlabel.h>
 #include <tqstyle.h>
diff --git a/twin/useractions.cpp b/twin/useractions.cpp
index 09e93b27f..1b5769f8d 100644
--- a/twin/useractions.cpp
+++ b/twin/useractions.cpp
@@ -25,7 +25,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalaccel.h>
 #include <kapplication.h>
 #include <tqregexp.h>
diff --git a/twin/workspace.cpp b/twin/workspace.cpp
index 4778caaa3..85308f66d 100644
--- a/twin/workspace.cpp
+++ b/twin/workspace.cpp
@@ -16,7 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kapplication.h>
 #include <kstartupinfo.h>
 #include <fixx11h.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <tqpopupmenu.h>
 #include <klocale.h>
@@ -1220,7 +1220,7 @@ TQStringList Workspace::configModules(bool controlCenter)
 
 void Workspace::configureWM()
     {
-    TDEApplication::tdeinitExec( "kcmshell", configModules(false) );
+    TDEApplication::tdeinitExec( "tdecmshell", configModules(false) );
     }
 
 /*!