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

80 files changed, 125 insertions, 125 deletions

diff --git a/kicker/applets/clock/Makefile.am b/kicker/applets/clock/Makefile.am
index 15bde61cf..fbb8ec319 100644
--- a/kicker/applets/clock/Makefile.am
+++ b/kicker/applets/clock/Makefile.am
@@ -19,7 +19,7 @@ clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 clock_panelapplet_la_LIBADD =  ../../libkicker/libkickermain.la $(LIB_TDEUI)
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -ltdefile
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/clockapplet.pot
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 35dccf148..f9dd63e9e 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontrequester.h>
 #include <kglobalsettings.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
@@ -1518,12 +1518,12 @@ void ClockApplet::contextMenuActivated(int result)
             proc << locate("exe", "tdesu");
             proc << "--nonewdcop";
             proc << TQString("%1 tde-clock.desktop --lang %2")
-                .arg(locate("exe", "kcmshell"))
+                .arg(locate("exe", "tdecmshell"))
                 .arg(TDEGlobal::locale()->language());
             proc.start(TDEProcess::DontCare);
             break;
         case 104:
-            proc << locate("exe", "kcmshell");
+            proc << locate("exe", "tdecmshell");
             proc << "tde-language.desktop";
             proc.start(TDEProcess::DontCare);
             break;
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 9a80c24b6..34d73cf83 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopobject.h>
 #include <kpanelapplet.h>
 #include <kdirwatch.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kickertip.h>
 #include "settings.h"
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index 9b89da87d..8cf336866 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -47,10 +47,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kstringhandler.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontrequester.h>
 #include <kglobalsettings.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 #include <kcalendarsystem.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
diff --git a/kicker/applets/clock/prefs.kcfgc b/kicker/applets/clock/prefs.kcfgc
index 890209526..fff5e1cad 100644
--- a/kicker/applets/clock/prefs.kcfgc
+++ b/kicker/applets/clock/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=clockapplet.kcfg
 ClassName=Prefs
 Singleton=false
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index bf007c933..c43b76db1 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "zone.h"
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt
index bf5111658..c022762c0 100644
--- a/kicker/applets/launcher/CMakeLists.txt
+++ b/kicker/applets/launcher/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES quicklauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
+install( FILES quictdelauncher.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
 install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
@@ -37,7 +37,7 @@ install( FILES launcherapplet.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 tde_add_kpart( launcher_panelapplet AUTOMOC
   SOURCES
-    quicklauncher.skel quicklauncher.cpp quickbutton.cpp
+    quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp
     quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp
     configdlgbase.ui prefs.kcfgc configdlg.cpp
   LINK
diff --git a/kicker/applets/launcher/ChangeLog b/kicker/applets/launcher/ChangeLog
index b86dbd7aa..1144a8c35 100644
--- a/kicker/applets/launcher/ChangeLog
+++ b/kicker/applets/launcher/ChangeLog
@@ -4,9 +4,9 @@
 	* Empty panel now has size>0, so user can still drop icons on it.
 	* Fixed gcc 3.4 incompatibilities in EasyVector
 	* Fixed Drag and Drop Bugs :
-	  * Crash when non-url dropped on quicklauncher
-	  * Crash panel button dropped on quicklauncher
-	  * Able to drop objects when quicklauncher is locked
+	  * Crash when non-url dropped on quictdelauncher
+	  * Crash panel button dropped on quictdelauncher
+	  * Able to drop objects when quictdelauncher is locked
 	* Add application context menu now inserts new app at current location
  	
 2004-06-14   Dan Bullok <dan.kde@bullok.com>
@@ -28,7 +28,7 @@
 	* Spouts tons of debugging info to kdDebug (for now).
 	
 2004-06-12   Dan Bullok <dan.kde@bullok.com>
-	* Fixed bug #75351:  Tooltips change to filenames after rearranging applications in quicklauncher.
+	* Fixed bug #75351:  Tooltips change to filenames after rearranging applications in quictdelauncher.
 	* Moved the URL->(menuID,service,kurl) functionality from the QuickButton constructor to its own class: QuickURL.  Very similar code is used elsewhere in kicker, and should eventually be merged.
 	* Renamed some methods in QuickButton (getId -> menuId, getURL -> url) This matches the predominant KDE naming style.
 	* Groundwork laid for variable-sized buttons.
diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am
index a0384df4f..1e586e0dd 100644
--- a/kicker/applets/launcher/Makefile.am
+++ b/kicker/applets/launcher/Makefile.am
@@ -3,13 +3,13 @@ INCLUDES = -I$(top_srcdir)/kicker/libkicker -I$(top_srcdir)/kicker/kicker/ui $(a
 
 kde_module_LTLIBRARIES = launcher_panelapplet.la
 
-launcher_panelapplet_la_SOURCES = quicklauncher.skel quicklauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
+launcher_panelapplet_la_SOURCES = quictdelauncher.skel quictdelauncher.cpp quickbutton.cpp quickaddappsmenu.cpp flowgridmanager.cpp popularity.cpp configdlgbase.ui prefs.kcfgc configdlg.cpp
 
 METASOURCES = AUTO
-noinst_HEADERS = quicklauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h
+noinst_HEADERS = quictdelauncher.h quickbutton.h quickaddappsmenu.h easyvector.h quickbuttongroup.h flowgridmanager.h popularity.h configdlg.h
 
 lnkdir = $(kde_datadir)/kicker/applets
-lnk_DATA = quicklauncher.desktop
+lnk_DATA = quictdelauncher.desktop
 
 EXTRA_DIST = $(lnk_DATA)
 
@@ -21,7 +21,7 @@ launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la  ../../kick
 kde_kcfg_DATA = launcherapplet.kcfg
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/quictdelauncher.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/quicklauncher quicklauncher *.h -lqt -ltdecore -ltdeui
+	kdoc -a -p -H -d $$HOME/web/src/quictdelauncher quictdelauncher *.h -lqt -ltdecore -ltdeui
diff --git a/kicker/applets/launcher/ToDo b/kicker/applets/launcher/ToDo
index c7c852a36..1f3932b08 100644
--- a/kicker/applets/launcher/ToDo
+++ b/kicker/applets/launcher/ToDo
@@ -3,6 +3,6 @@ TODO:
       x * Remove debugging code (makes everything slow).
 	* Tooltip or other popup to alert user that buttons are locked (with a "don't show this again" checkbox).
 	* Docs.
-	* Use old quicklauncher config file if found.  #77959
+	* Use old quictdelauncher config file if found.  #77959
       X * "Add application" context menu should add the new application at the index of the button that summoned the context menu.
       X * Make sure to always have a little space to drop things on, even when there are no buttons.
diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h
index e5fdbe34b..b96caf459 100644
--- a/kicker/applets/launcher/configdlg.h
+++ b/kicker/applets/launcher/configdlg.h
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef CONFIG_DLG_H
 #define CONFIG_DLG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class ConfigDlgBase;
 class Prefs;
diff --git a/kicker/applets/launcher/popularity.cpp b/kicker/applets/launcher/popularity.cpp
index a22a98c99..f38062e5b 100644
--- a/kicker/applets/launcher/popularity.cpp
+++ b/kicker/applets/launcher/popularity.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <assert.h>
 #include <algorithm>
 #include <iterator>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <list>
 #include <set>
diff --git a/kicker/applets/launcher/prefs.kcfgc b/kicker/applets/launcher/prefs.kcfgc
index 243e97868..8a605b327 100644
--- a/kicker/applets/launcher/prefs.kcfgc
+++ b/kicker/applets/launcher/prefs.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=launcherapplet.kcfg
 ClassName=Prefs
 Singleton=false
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index e5658f1cb..87ac35387 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
 #include <kdebug.h>
@@ -52,7 +52,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "configdlg.h"
 #include "popularity.h"
-#include "quicklauncher.h"
+#include "quictdelauncher.h"
 #include "quickbutton.h"
 #include "quickaddappsmenu.h"
 #include "quickbuttongroup.h"
@@ -71,10 +71,10 @@ extern "C"
 {
     KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
-        TDEGlobal::locale()->insertCatalogue("quicklauncher");
+        TDEGlobal::locale()->insertCatalogue("quictdelauncher");
         return new QuickLauncher(configFile, KPanelApplet::Normal,
                                  KPanelApplet::Preferences,
-                                 parent, "quicklauncher");
+                                 parent, "quictdelauncher");
     }
 }
 
@@ -107,7 +107,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
     m_oldButtons = 0;
     m_dragButtons = 0;
 
-    m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(),
+    m_configAction = new KAction(i18n("Configure Quictdelauncher..."), "configure", KShortcut(),
         TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this));
 
     m_saveTimer = new TQTimer(this, "m_saveTimer");
@@ -135,7 +135,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
         "QuickLauncherApplet",
         "serviceStartedByStorageId(TQString,TQString)",
         false);
-    kdDebug() << "Quicklauncher registered DCOP signal" << endl;
+    kdDebug() << "Quictdelauncher registered DCOP signal" << endl;
 }
 
 
@@ -143,7 +143,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,
 
 QuickLauncher::~QuickLauncher()
 {
-    TDEGlobal::locale()->removeCatalogue("quicklauncher");
+    TDEGlobal::locale()->removeCatalogue("quictdelauncher");
     setCustomMenu(0);
     delete m_popup;
     delete m_appletPopup;
@@ -496,7 +496,7 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender)
 
 void QuickLauncher::about()
 {
-    TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0",
+    TDEAboutData about("quictdelauncher", I18N_NOOP("Quick Launcher"), "2.0",
                      I18N_NOOP("A simple application launcher"),
                      TDEAboutData::License_GPL_V2, 
                      "(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen");
@@ -949,7 +949,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto
     QuickURL url = QuickURL(locate("apps", service->desktopEntryPath()));
     TQString desktopMenuId(url.menuId());
     kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl;
-    // A service was started somwhere else. If the quicklauncher contains
+    // A service was started somwhere else. If the quictdelauncher contains
     // this service too, we flash the icon
     QuickButton *startedButton = 0;
     std::set<TQString> buttonIdSet;
@@ -1127,4 +1127,4 @@ void QuickLauncher::positionChange(Position)
 }
 
 
-#include "quicklauncher.moc"
+#include "quictdelauncher.moc"
diff --git a/kicker/applets/launcher/quicklauncher.desktop b/kicker/applets/launcher/quictdelauncher.desktop
index 771dc687e..771dc687e 100644
--- a/kicker/applets/launcher/quicklauncher.desktop
+++ b/kicker/applets/launcher/quictdelauncher.desktop
diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quictdelauncher.h
index 2dadf6344..c6fe1d2bb 100644
--- a/kicker/applets/launcher/quicklauncher.h
+++ b/kicker/applets/launcher/quictdelauncher.h
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#ifndef __quicklauncher_h__
-#define __quicklauncher_h__
+#ifndef __quictdelauncher_h__
+#define __quictdelauncher_h__
 
 #include <dcopobject.h>
 #include <tqimage.h>
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 72652d74b..b55aae92d 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -250,7 +250,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 void Lockout::slotLockPrefs()
 {
     // Run the screensaver settings
-    KRun::run( "kcmshell screensaver", KURL::List() );
+    KRun::run( "tdecmshell screensaver", KURL::List() );
 }
 
 void Lockout::slotTransparent()
@@ -266,7 +266,7 @@ void Lockout::slotTransparent()
 void Lockout::slotLogoutPrefs()
 {
     // Run the logout settings.
-    KRun::run( "kcmshell kcmsmserver", KURL::List() );
+    KRun::run( "tdecmshell kcmsmserver", KURL::List() );
 }
 
 void Lockout::slotIconChanged()
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 527c92b62..f8a1ac630 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -19,7 +19,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
diff --git a/kicker/applets/media/mediaapplet.h b/kicker/applets/media/mediaapplet.h
index 68d0b5d99..4c57b508d 100644
--- a/kicker/applets/media/mediaapplet.h
+++ b/kicker/applets/media/mediaapplet.h
@@ -26,9 +26,9 @@
 
 #include <kpanelapplet.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kdirlister.h>
 
 #include <tqptrlist.h>
diff --git a/kicker/applets/media/mediumbutton.h b/kicker/applets/media/mediumbutton.h
index 3fa31756a..5f6a2b80b 100644
--- a/kicker/applets/media/mediumbutton.h
+++ b/kicker/applets/media/mediumbutton.h
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <tqcursor.h>
 #include <tqtimer.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kpanelapplet.h>
 #include <kactioncollection.h>
 
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index bf8234fe5..f53381a10 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -24,7 +24,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <klistview.h>
-#include <kfiledetailview.h>
+#include <tdefiledetailview.h>
 
 class MediumTypeItem : public TQCheckListItem
 {
diff --git a/kicker/applets/media/preferencesdialog.h b/kicker/applets/media/preferencesdialog.h
index e946f81de..f758d280b 100644
--- a/kicker/applets/media/preferencesdialog.h
+++ b/kicker/applets/media/preferencesdialog.h
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 #include <kdialogbase.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 /**
   *@author ervin
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index 732f5acdb..8a9f68095 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqvariant.h> // avoid X11 #define's
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kicker/applets/minipager/Makefile.am b/kicker/applets/minipager/Makefile.am
index 9320c30f5..f1009df41 100644
--- a/kicker/applets/minipager/Makefile.am
+++ b/kicker/applets/minipager/Makefile.am
@@ -22,4 +22,4 @@ messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kminipagerapplet.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/kminipagerapplet kminipagerapplet *.h -lqt -ltdecore -ltdeui -ltdefile
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index eb663814b..4e3332768 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -28,7 +28,7 @@
 
 #include <kiconloader.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
 #include <klocale.h>
diff --git a/kicker/applets/run/CMakeLists.txt b/kicker/applets/run/CMakeLists.txt
index 68c7c7c0c..0e1ca3960 100644
--- a/kicker/applets/run/CMakeLists.txt
+++ b/kicker/applets/run/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES runapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
 
 tde_add_kpart( run_panelapplet AUTOMOC
   SOURCES runapplet.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index f0069cae6..5f930190a 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kurifilter.h>
 #include <kdialog.h>
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index 428d0bb7e..2f5000b72 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -25,7 +25,7 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am
index 2749c7391..3ba76ca5c 100644
--- a/kicker/applets/systemtray/Makefile.am
+++ b/kicker/applets/systemtray/Makefile.am
@@ -21,4 +21,4 @@ messages:
 	$(XGETTEXT)  *.cpp *.h -o $(podir)/ksystemtrayapplet.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/ksystemtrayapplet ksystemtrayapplet *.h -lqt -ltdecore -ltdeui -ltdefile
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 02f13df2b..835174f92 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <krun.h>
diff --git a/kicker/applets/taskbar/Makefile.am b/kicker/applets/taskbar/Makefile.am
index 9f6914f8e..c1375230e 100644
--- a/kicker/applets/taskbar/Makefile.am
+++ b/kicker/applets/taskbar/Makefile.am
@@ -19,4 +19,4 @@ messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/ktaskbarapplet.pot
 
 srcdoc:
-	kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -lkfile
+	kdoc -a -p -H -d $$HOME/web/src/ktaskbarapplet ktaskbarapplet *.h -lqt -ltdecore -ltdeui -ltdefile
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 6e1f11504..478ac01ec 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -19,7 +19,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp
index 57904db43..1f45e1fb4 100644
--- a/kicker/applets/trash/trashbutton.cpp
+++ b/kicker/applets/trash/trashbutton.cpp
@@ -26,7 +26,7 @@
 #include <krun.h>
 #include <kpopupmenu.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <konq_operations.h>
 #include <konq_popupmenu.h>
diff --git a/kicker/applets/trash/trashbutton.h b/kicker/applets/trash/trashbutton.h
index 891e274c0..0ddad290e 100644
--- a/kicker/applets/trash/trashbutton.h
+++ b/kicker/applets/trash/trashbutton.h
@@ -26,7 +26,7 @@
 #include <tqpixmap.h>
 #include <tqcursor.h>
 #include <tqtimer.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kpanelapplet.h>
 #include <kactioncollection.h>
 
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 393e9a2d6..79c504874 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <twinmodule.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <kshell.h>
 #include <twin.h>
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index abd6337df..f35fc997b 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -53,7 +53,7 @@
 */
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <twin.h>
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 6e011cc71..ff2a7c60d 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -59,7 +59,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kmessagebox.h>
 
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 31f5c5a33..c3f34c0ac 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -63,7 +63,7 @@
 #include <tqwhatsthis.h>
 
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index a11c18547..86d688b27 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -55,13 +55,13 @@
 #include <tqtimer.h>
 
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 
-//#include <kconfiggroupsaver.h>
+//#include <tdeconfiggroupsaver.h>
 
 #include <taskmanager.h>
 
diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt
index 313187cee..ce4befcae 100644
--- a/kicker/kicker/CMakeLists.txt
+++ b/kicker/kicker/CMakeLists.txt
@@ -30,12 +30,12 @@ link_directories( ${TQT_LIBRARY_DIRS} )
 
 install( FILES panel.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kcmkicker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kickerrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+install( FILES kickerrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 install( PROGRAMS
     kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl
-    kicker-3.5-kconfigXTize.pl
-  DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+    kicker-3.5-tdeconfigXTize.pl
+  DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update )
 
 
 ##### kicker-3.4-reverseLayout (executable) #####
@@ -43,7 +43,7 @@ install( PROGRAMS
 tde_add_executable( kicker-3.4-reverseLayout
   SOURCES kicker-3.4-reverseLayout.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
 
 
diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am
index cf22b5c70..c97d61f60 100644
--- a/kicker/kicker/Makefile.am
+++ b/kicker/kicker/Makefile.am
@@ -28,14 +28,14 @@ messages: rc.cpp
 dummy.cpp:
 	echo > $@
  
-kconf_PROGRAMS = kicker-3.4-reverseLayout
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = kicker-3.4-reverseLayout
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 kicker_3_4_reverseLayout_SOURCES = kicker-3.4-reverseLayout.cpp
 kicker_3_4_reverseLayout_LDADD   = $(LIB_QT) $(LIB_TDECORE)
 kicker_3_4_reverseLayout_LDFLAGS = $(all_libraries)
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kickerrc.upd
-update_SCRIPTS = kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl kicker-3.5-kconfigXTize.pl
+update_SCRIPTS = kicker-3.1-properSizeSetting.pl kicker-3.5-taskbarEnums.pl kicker-3.5-tdeconfigXTize.pl
 
diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp
index e470fb93a..36d650271 100644
--- a/kicker/kicker/buttons/browserbutton.cpp
+++ b/kicker/kicker/buttons/browserbutton.cpp
@@ -25,10 +25,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqdragobject.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <konq_operations.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "kicker.h"
 #include "browser_mnu.h"
diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp
index c35a8bf47..dc6063c2b 100644
--- a/kicker/kicker/buttons/desktopbutton.cpp
+++ b/kicker/kicker/buttons/desktopbutton.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <konq_operations.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include "showdesktop.h"
 #include "kicker.h"
diff --git a/kicker/kicker/buttons/extensionbutton.cpp b/kicker/kicker/buttons/extensionbutton.cpp
index 8ab9fd0bd..f45a61a4b 100644
--- a/kicker/kicker/buttons/extensionbutton.cpp
+++ b/kicker/kicker/buttons/extensionbutton.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqtooltip.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpanelmenu.h>
 
 #include "menuinfo.h"
diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp
index e48386008..016c75aee 100644
--- a/kicker/kicker/buttons/nonkdeappbutton.cpp
+++ b/kicker/kicker/buttons/nonkdeappbutton.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqdragobject.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kapplication.h>
 #include <kglobal.h>
diff --git a/kicker/kicker/buttons/servicemenubutton.cpp b/kicker/kicker/buttons/servicemenubutton.cpp
index 0ebc931f4..a15ba1cf1 100644
--- a/kicker/kicker/buttons/servicemenubutton.cpp
+++ b/kicker/kicker/buttons/servicemenubutton.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqtooltip.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kservicegroup.h>
 #include <klocale.h>
 
diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp
index 132aa8193..ac9934b33 100644
--- a/kicker/kicker/buttons/urlbutton.cpp
+++ b/kicker/kicker/buttons/urlbutton.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 
 #include <kdesktopfile.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <konq_operations.h>
 #include <kicontheme.h>
 #include <kglobal.h>
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index a35b34fd0..d3d7f10ba 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index 56c09f285..1efafe801 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpopupmenu.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "global.h"
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 30c31401d..8196127e9 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdemultipledrag.h>
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 7639fe146..d2f2982b7 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -38,7 +38,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqcolor.h>
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 12949f95b..c42ffc13a 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <krootpixmap.h>
 #include <kpixmap.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kservice.h>
 #include <kurldrag.h>
 
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index 62594443f..893cb1665 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
@@ -233,7 +233,7 @@ void ExtensionManager::migrateMenubar()
     // will have a menubar in it, and if so, abort creating one of our
     // own.
     //
-    // the reason i didn't do this as a kconfig_update script is that
+    // the reason i didn't do this as a tdeconfig_update script is that
     // most people don't use this feature, so no reason to penalize
     // everyone, and moreover the user may added this to their main
     // panel, meaning kickerrc itself would have to be vastly modified
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 3fa04e374..0521e6413 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -29,7 +29,7 @@
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmdlineargs.h>
 #include <kcmultidialog.h>
 #include <kcrash.h>
diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp
index 17a148474..e6c5ba842 100644
--- a/kicker/kicker/core/main.cpp
+++ b/kicker/kicker/core/main.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <kaboutdata.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 6b41f1c50..fbf6b9e43 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobal.h>
 #include <kpopupmenu.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdguiitem.h>
 
 #include "container_applet.h"
diff --git a/kicker/kicker/kcmkicker.desktop b/kicker/kicker/kcmkicker.desktop
index 929871123..348ed746e 100644
--- a/kicker/kicker/kcmkicker.desktop
+++ b/kicker/kicker/kcmkicker.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-Exec=kcmshell %i kicker_config kcmtaskbar
+Exec=tdecmshell %i kicker_config kcmtaskbar
 Name=Configure the Panel
 Name[af]=Stel die paneel op
 Name[ar]=قم بإعداد اللوحة
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp
index a588c6258..9491e7d41 100644
--- a/kicker/kicker/kicker-3.4-reverseLayout.cpp
+++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp
@@ -130,7 +130,7 @@ int main(int argc, char** argv)
 
     if (!childPanelConfigFiles.isEmpty())
     {
-        // Create a temporary kconf_update .upd file for updating the childpanels
+        // Create a temporary tdeconf_update .upd file for updating the childpanels
         KTempFile tempFile(TQString::null, ".upd");
         TQTextStream* upd = tempFile.textStream();
         for (it = childPanelConfigFiles.begin(); it != childPanelConfigFiles.end(); ++it)
@@ -142,10 +142,10 @@ int main(int argc, char** argv)
         }
         tempFile.close();
 
-        // Run kconf_update on the childpanel config files.
-        TDEProcess kconf_update;
-        kconf_update << "kconf_update" << tempFile.name();
-        kconf_update.start(TDEProcess::Block);
+        // Run tdeconf_update on the childpanel config files.
+        TDEProcess tdeconf_update;
+        tdeconf_update << "tdeconf_update" << tempFile.name();
+        tdeconf_update.start(TDEProcess::Block);
 
         tempFile.unlink();
     }
diff --git a/kicker/kicker/kicker-3.5-kconfigXTize.pl b/kicker/kicker/kicker-3.5-tdeconfigXTize.pl
index e836116d7..e836116d7 100755
--- a/kicker/kicker/kicker-3.5-kconfigXTize.pl
+++ b/kicker/kicker/kicker-3.5-tdeconfigXTize.pl
diff --git a/kicker/kicker/kickerrc.upd b/kicker/kicker/kickerrc.upd
index 282a52cb1..5b82f9e2c 100644
--- a/kicker/kicker/kickerrc.upd
+++ b/kicker/kicker/kickerrc.upd
@@ -14,9 +14,9 @@ Group=General
 Options=overwrite
 Script=kicker-3.5-taskbarEnums.pl,perl
 
-Id=kde_3_5_kconfigXTize
+Id=kde_3_5_tdeconfigXTize
 File=kickerrc
 Group=menus
-Script=kicker-3.5-kconfigXTize.pl,perl
+Script=kicker-3.5-tdeconfigXTize.pl,perl
 RemoveKey=DetailedEntriesNamesFirst
 RemoveKey=DetailedMenuEntries
diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp
index 6aa246eb6..3ebe095dc 100644
--- a/kicker/kicker/ui/browser_dlg.cpp
+++ b/kicker/kicker/ui/browser_dlg.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobal.h>
 #include <klocale.h>
 #include <kicondialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
 
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index c6ca4ab32..9aa352500 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -28,12 +28,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirwatch.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <konq_operations.h>
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 3d33a825a..ee82bc91f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kpixmapeffect.h>
 #include <kaction.h>
 #include <kbookmarkmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 84c977331..eb87f02d0 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kaboutkde.h>
 #include <kaction.h>
 #include <kbookmarkmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 6f2c4eacb..f5bf25471 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -48,7 +48,7 @@
 #include <kaboutkde.h>
 #include <kaction.h>
 #include <kbookmarkmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
@@ -70,8 +70,8 @@
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
 #include <kprocess.h>
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 #include <dcopref.h>
 #include <konq_popupmenu.h>
 #include <konqbookmarkmanager.h>
@@ -3512,16 +3512,16 @@ bool KMenu::ensureServiceRunning(const TQString & service)
     TQDataStream arg(data, IO_WriteOnly);
     arg << service << URLs;
 
-    if ( !kapp->dcopClient()->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+    if ( !kapp->dcopClient()->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
                       data, replyType, replyData) ) {
-        tqWarning( "call to klauncher failed.");
+        tqWarning( "call to tdelauncher failed.");
         return false;
     }
     TQDataStream reply(replyData, IO_ReadOnly);
 
     if ( replyType != "serviceResult" )
     {
-        tqWarning( "unexpected result '%s' from klauncher.", replyType.data());
+        tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data());
         return false;
     }
     int result;
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 1e77a1731..dfe3f4433 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kurldrag.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "global.h"
 #include "kicker.h"
diff --git a/kicker/libkicker/CMakeLists.txt b/kicker/libkicker/CMakeLists.txt
index 036095728..e2ec5a6ba 100644
--- a/kicker/libkicker/CMakeLists.txt
+++ b/kicker/libkicker/CMakeLists.txt
@@ -37,6 +37,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index f300df3a2..87f990b30 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
 #include <ksimpleconfig.h>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index e9481ea85..1f011da5a 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpixmap.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>
 #include <kdirwatch.h>
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 032a2ab05..e4de35081 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -22,7 +22,7 @@
 #include "katesessionmenu.moc"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
diff --git a/kicker/menuext/konq-profiles/CMakeLists.txt b/kicker/menuext/konq-profiles/CMakeLists.txt
index 9154412c8..2847be4fe 100644
--- a/kicker/menuext/konq-profiles/CMakeLists.txt
+++ b/kicker/menuext/konq-profiles/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES konquerormenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menu
 
 tde_add_kpart( kickermenu_konqueror AUTOMOC
   SOURCES konqy_menu.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index a3c076741..4ed8c32e1 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <ksimpleconfig.h>
 
 #include <tqregexp.h>
diff --git a/kicker/menuext/konsole/CMakeLists.txt b/kicker/menuext/konsole/CMakeLists.txt
index e16884acf..9c2f7224f 100644
--- a/kicker/menuext/konsole/CMakeLists.txt
+++ b/kicker/menuext/konsole/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES konsolemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuex
 
 tde_add_kpart( kickermenu_konsole AUTOMOC
   SOURCES konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index dbaa1e434..d2fb755bb 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <krun.h>
 #include <kshell.h>
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index e515e41f5..e12d6ebc1 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -1,4 +1,4 @@
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.cpp
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,7 +29,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
 
     // import old bookmarks
     if ( !KStandardDirs::exists( file ) ) {
-        TQString oldFile = locate( "data", "kfile/bookmarks.html" );
+        TQString oldFile = locate( "data", "tdefile/bookmarks.html" );
         if ( !oldFile.isEmpty() )
             importOldBookmarks( oldFile, file );
     }
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.h b/kicker/menuext/konsole/konsolebookmarkhandler.h
index cc0b1886b..733e52442 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.h
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.h
@@ -1,4 +1,4 @@
-// Born as tdelibs/kio/kfile/kfilebookmarkhandler.h
+// Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.h
 
 #ifndef KONSOLEBOOKMARKHANDLER_H
 #define KONSOLEBOOKMARKHANDLER_H
diff --git a/kicker/menuext/recentdocs/CMakeLists.txt b/kicker/menuext/recentdocs/CMakeLists.txt
index ebefed9c6..4b3053efe 100644
--- a/kicker/menuext/recentdocs/CMakeLists.txt
+++ b/kicker/menuext/recentdocs/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES recentdocs.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext
 
 tde_add_kpart( kickermenu_recentdocs AUTOMOC
   SOURCES recentdocsmenu.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/menuext/system/systemmenu.h b/kicker/menuext/system/systemmenu.h
index f25280989..1efbc3c57 100644
--- a/kicker/menuext/system/systemmenu.h
+++ b/kicker/menuext/system/systemmenu.h
@@ -23,7 +23,7 @@
 #include <kpanelmenu.h>
 #include <kurl.h>
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 class SystemMenu : public KPanelMenu
 {
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index fb10e0f34..e611b039e 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -112,7 +112,7 @@ void PrintMenu::slotExec(int ID)
 	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
 	    break;
         case PRINT_MANAGER_ID:
-            KRun::runCommand("kcmshell tde-printers.desktop");
+            KRun::runCommand("tdecmshell tde-printers.desktop");
             break;
         case PRINT_BROWSER_ID:
             KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 6215f9ba6..a1d68e98a 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqimage.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>