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

55 files changed, 133 insertions, 133 deletions

diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index e738e7be3..a42f8e208 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -25,9 +25,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdefx
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
-  ${CMAKE_SOURCE_DIR}/kio/kfile
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdefile
   ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -73,7 +73,7 @@ install( FILES
     ktextedit.h kpassivepopup.h
     kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h
     tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h
-    ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h
+    ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h
     kactionselector.h klanguagebutton.h klistviewsearchline.h
     kpixmapregionselectorwidget.h kpixmapregionselectordialog.h
     kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
@@ -138,7 +138,7 @@ set( ${target}_SRCS
   ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp
   ksconfig.cpp tdespelldlg.cpp
   tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp
-  ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp
+  ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp
   kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp
   kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp
   kwhatsthismanager.cpp kiconviewsearchline.cpp
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index f3ccef8b7..13d5b3c4f 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -70,7 +70,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		ktextedit.h kpassivepopup.h \
 		kdatetimewidget.h ktimewidget.h ktimezonewidget.h kscrollview.h \
 		tdespell.h ksconfig.h tdespelldlg.h ksyntaxhighlighter.h \
-		ktabbar.h ktabwidget.h ksplashscreen.h kconfigdialog.h \
+		ktabbar.h ktabwidget.h ksplashscreen.h tdeconfigdialog.h \
 		kactionselector.h klanguagebutton.h klistviewsearchline.h \
 		kpixmapregionselectorwidget.h kpixmapregionselectordialog.h \
 		kiconviewsearchline.h ktoolbarlabelaction.h kshortcutdialog.h
@@ -119,7 +119,7 @@ libtdeui_la_SOURCES = \
 		ktoolbarhandler.cpp kdatetimewidget.cpp ktimewidget.cpp ktimezonewidget.cpp \
 		ksconfig.cpp tdespelldlg.cpp \
 		tdespell.cpp ksyntaxhighlighter.cpp ktabbar.cpp ktabwidget.cpp \
-		ksplashscreen.cpp tdespellui.ui kconfigdialog.cpp \
+		ksplashscreen.cpp tdespellui.ui tdeconfigdialog.cpp \
 		kactionselector.cpp klanguagebutton.cpp klistviewsearchline.cpp \
 		kpixmapregionselectorwidget.cpp kpixmapregionselectordialog.cpp \
 		kwhatsthismanager.cpp kiconviewsearchline.cpp \
diff --git a/tdeui/kactionclasses.cpp b/tdeui/kactionclasses.cpp
index 605ac8379..52b3441c2 100644
--- a/tdeui/kactionclasses.cpp
+++ b/tdeui/kactionclasses.cpp
@@ -43,7 +43,7 @@
 #include <dcopref.h>
 #include <kaccel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kfontcombo.h>
 #include <kfontdialog.h>
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index ab36f83d7..1812487c1 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -319,11 +319,11 @@ void KBugReport::slotConfigureEmail()
 {
   if (m_process) return;
   m_process = new TDEProcess;
-  *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount");
+  *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
   connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom()));
   if (!m_process->start())
   {
-    kdDebug() << "Couldn't start kcmshell.." << endl;
+    kdDebug() << "Couldn't start tdecmshell.." << endl;
     delete m_process;
     m_process = 0;
     return;
@@ -489,9 +489,9 @@ bool KBugReport::sendBugReport()
     TQString::fromLatin1("submit@bugs.pearsoncomputing.net") );
 
   TQString command;
-  command = locate("exe", "ksendbugmail");
+  command = locate("exe", "tdesendbugmail");
   if (command.isEmpty())
-      command = KStandardDirs::findExe( TQString::fromLatin1("ksendbugmail") );
+      command = KStandardDirs::findExe( TQString::fromLatin1("tdesendbugmail") );
 
   KTempFile outputfile;
   outputfile.close();
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index b8ddd39f7..aec61d668 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -57,7 +57,7 @@ public:
 
 protected slots:
   /**
-   * "Configure email" has been clicked - this calls kcmshell System/email
+   * "Configure email" has been clicked - this calls tdecmshell System/email
    */
   virtual void slotConfigureEmail();
   /**
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index 5af7b6de6..f71a88f79 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include "kcmenumngr.h"
 #include "kglobal.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kshortcut.h"
 
 #undef KeyPress
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index a7dd90ac7..52291f762 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -45,7 +45,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index 2651fd05d..7182e9ddc 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -46,7 +46,7 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index e0ff8e6e4..247217aaf 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -654,7 +654,7 @@ public:
      * KPixmapProvider is just an abstract class with the one pure virtual
      * method KPixmapProvider::pixmapFor(). This method is called whenever
      * an item is added to the KHistoryComboBox. Implement it to return your
-     * own custom pixmaps, or use the KURLPixmapProvider from libkio,
+     * own custom pixmaps, or use the KURLPixmapProvider from libtdeio,
      * which uses KMimeType::pixmapForURL to resolve icons.
      *
      * Set @p prov to 0L if you want to disable pixmaps. Default no pixmaps.
diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp
index efcda9ebe..2e63cb21f 100644
--- a/tdeui/kcompletionbox.cpp
+++ b/tdeui/kcompletionbox.cpp
@@ -27,7 +27,7 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <kglobalsettings.h>
 
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 4bd337c35..3cc224f4a 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -31,7 +31,7 @@
 #include <tqwidget.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqscrollview.h>
 
 #include "kcursor_private.h"
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index 632c7deea..b73b8b4eb 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -32,7 +32,7 @@
 // When a date is selected by the user, it emits a signal:
 //      dateSelected(TQDate)
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kapplication.h>
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index 58ea0f867..fa07e627d 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -306,8 +306,8 @@ const char * const packages[] = {
 "kchart/usability",
 "kchat",
 "kcoloredit",
-"kconfigeditor",
-"kconfigure",
+"tdeconfigeditor",
+"tdeconfigure",
 "kcontrol",
 "kcontrol/kcmaccess",
 "kcontrol/kcmaccessibility",
@@ -362,7 +362,7 @@ const char * const packages[] = {
 "kcontrol/kcmproxy",
 "kcontrol/kcmsamba",
 "kcontrol/kcmscreensaver",
-"kcontrol/kcmshell",
+"kcontrol/tdecmshell",
 "kcontrol/kcmsmserver",
 "kcontrol/kcmspellchecking",
 "kcontrol/kcmstyle",
@@ -388,9 +388,9 @@ const char * const packages[] = {
 "kde-bluetooth/kbtserialchat",
 "kde-bluetooth/khciconfig",
 "kde-bluetooth/kinputwizard",
-"kde-bluetooth/kio_bluetooth",
-"kde-bluetooth/kio_obex",
-"kde-bluetooth/kio_sdp",
+"kde-bluetooth/tdeio_bluetooth",
+"kde-bluetooth/tdeio_obex",
+"kde-bluetooth/tdeio_sdp",
 "kde-windows",
 "kde-windows/buildsystem",
 "kde-windows/gui",
@@ -421,7 +421,7 @@ const char * const packages[] = {
 "tdelibs/tdeui",
 "tdelibs/kedittoolbar",
 "tdelibs/kimgio",
-"tdelibs/klauncher",
+"tdelibs/tdelauncher",
 "tdelibs/klocale",
 "tdelibs/tdemdi",
 "tdelibs/knetwork",
@@ -572,21 +572,21 @@ const char * const packages[] = {
 "kexi/Usability",
 "keystone",
 "kfax",
-"kfile-plugins",
-"kfile-plugins/OOo",
-"kfile-plugins/PNG",
-"kfile-plugins/avi",
-"kfile-plugins/exr",
-"kfile-plugins/jpeg",
-"kfile-plugins/mp3",
-"kfile-plugins/mpeg",
-"kfile-plugins/ogg",
-"kfile-plugins/pdf",
-"kfile-plugins/ps",
-"kfile-plugins/wav",
-"kfile",
-"kfile/kfileplacesview",
-"kfilereplace",
+"tdefile-plugins",
+"tdefile-plugins/OOo",
+"tdefile-plugins/PNG",
+"tdefile-plugins/avi",
+"tdefile-plugins/exr",
+"tdefile-plugins/jpeg",
+"tdefile-plugins/mp3",
+"tdefile-plugins/mpeg",
+"tdefile-plugins/ogg",
+"tdefile-plugins/pdf",
+"tdefile-plugins/ps",
+"tdefile-plugins/wav",
+"tdefile",
+"tdefile/tdefileplacesview",
+"tdefilereplace",
 "kfind",
 "kfinger",
 "kfloppy",
@@ -638,7 +638,7 @@ const char * const packages[] = {
 "kicker/minipagerapplet",
 "kicker/multiscreen",
 "kicker/naughtyapplet",
-"kicker/quicklauncher",
+"kicker/quictdelauncher",
 "kicker/sidebar",
 "kicker/systemtray",
 "kicker/taskbarapplet",
@@ -654,46 +654,46 @@ const char * const packages[] = {
 "kimdaba",
 "kinkatta",
 "kio",
-"kio/audiocd",
-"kio/cgi",
-"kio/devices",
-"kio/file",
-"kio/fish",
-"kio/floppy",
-"kio/ftp",
-"kio/gopher",
-"kio/help",
-"kio/home",
-"kio/http",
-"kio/imap",
-"kio/info",
-"kio/kamera",
-"kio/kfile",
-"kio/kioslave",
-"kio/kssl",
-"kio/man",
-"kio/media",
-"kio/nfs",
-"kio/nntp",
-"kio/pop3",
-"kio/remote",
-"kio/settings",
-"kio/sftp",
-"kio/sieve",
-"kio/smb",
-"kio/smbro",
-"kio/smtp",
-"kio/svn",
-"kio/system",
-"kio/tar",
-"kio/thumbnail",
-"kio/trash",
-"kio/uiserver",
-"kio/webdav",
-"kio/zeroconf",
-"kio/zip",
+"tdeio/audiocd",
+"tdeio/cgi",
+"tdeio/devices",
+"tdeio/file",
+"tdeio/fish",
+"tdeio/floppy",
+"tdeio/ftp",
+"tdeio/gopher",
+"tdeio/help",
+"tdeio/home",
+"tdeio/http",
+"tdeio/imap",
+"tdeio/info",
+"tdeio/kamera",
+"tdeio/tdefile",
+"tdeio/tdeioslave",
+"tdeio/kssl",
+"tdeio/man",
+"tdeio/media",
+"tdeio/nfs",
+"tdeio/nntp",
+"tdeio/pop3",
+"tdeio/remote",
+"tdeio/settings",
+"tdeio/sftp",
+"tdeio/sieve",
+"tdeio/smb",
+"tdeio/smbro",
+"tdeio/smtp",
+"tdeio/svn",
+"tdeio/system",
+"tdeio/tar",
+"tdeio/thumbnail",
+"tdeio/trash",
+"tdeio/uiserver",
+"tdeio/webdav",
+"tdeio/zeroconf",
+"tdeio/zip",
 "kiosk",
-"kiosk/kiosktool",
+"kiosk/tdeiosktool",
 "kipiplugins",
 "kipiplugins/GPSSync",
 "kipiplugins/HTMLExport",
@@ -815,7 +815,7 @@ const char * const packages[] = {
 "knetload",
 "knetload/Linux Statistics",
 "knetwalk",
-"knetworkconf",
+"knetwortdeconf",
 "knetworkmanager",
 "knetworkmanager/802.1x",
 "knetworkmanager/cellular",
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 3821e6a26..53d7b4f05 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -18,7 +18,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdialog.h>
 #include <kwhatsthismanager_p.h>
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 3a7be7a94..46d0697d5 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -35,7 +35,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index a1ef8aad1..0bfebe0ab 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -33,7 +33,7 @@
 #include <tqstyle.h>
 
 #ifndef NO_KDE2
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktoolbar.h>
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 563b007c0..63c4bc2b2 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -40,7 +40,7 @@
 #include <kmessagebox.h>
 #include <kxmlguifactory.h>
 #include <kseparator.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
@@ -1373,8 +1373,8 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem)
 
 void KEditToolbarWidget::slotChangeIcon()
 {
-  // We can't use KIconChooser here, since it's in libkio
-  // ##### KDE4: reconsider this, e.g. move KEditToolbar to libkio
+  // We can't use KIconChooser here, since it's in libtdeio
+  // ##### KDE4: reconsider this, e.g. move KEditToolbar to libtdeio
   
   //if the process is already running (e.g. when somebody clicked the change button twice (see #127149)) - do nothing... 
   //otherwise m_kdialogProcess will be overwritten and set to zero in slotProcessExited()...crash!
diff --git a/tdeui/kfontcombo.cpp b/tdeui/kfontcombo.cpp
index 1923f6cb9..f36b18510 100644
--- a/tdeui/kfontcombo.cpp
+++ b/tdeui/kfontcombo.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 
diff --git a/tdeui/kfontdialog.cpp b/tdeui/kfontdialog.cpp
index 01073521d..97f43544c 100644
--- a/tdeui/kfontdialog.cpp
+++ b/tdeui/kfontdialog.cpp
@@ -43,7 +43,7 @@
 
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 430a23fa0..185450880 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -25,7 +25,7 @@
 
 #include "kiconview.h"
 #include "kwordwrap.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index b83cc6d53..8de6a6e59 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -40,7 +40,7 @@
 #include <kaccelaction.h>
 #include <kactionshortcutlist.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index d70485b09..f6fa42611 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -29,7 +29,7 @@
 #include <tqpainter.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 #include <kcursor.h>
 #include <klocale.h>
diff --git a/tdeui/klistview.cpp b/tdeui/klistview.cpp
index b604658f1..24c5f3a4b 100644
--- a/tdeui/klistview.cpp
+++ b/tdeui/klistview.cpp
@@ -28,7 +28,7 @@
 #include <tqpainter.h>
 
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kapplication.h>
 #include <kipc.h>
diff --git a/tdeui/kmainwindow.cpp b/tdeui/kmainwindow.cpp
index 14f6f6bea..de9bb8f8f 100644
--- a/tdeui/kmainwindow.cpp
+++ b/tdeui/kmainwindow.cpp
@@ -37,7 +37,7 @@
 #include <kaccel.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kmenubar.h>
diff --git a/tdeui/kmainwindow.h b/tdeui/kmainwindow.h
index a66eb8327..5ddb669ee 100644
--- a/tdeui/kmainwindow.h
+++ b/tdeui/kmainwindow.h
@@ -873,7 +873,7 @@ protected:
      * invoked when the session manager requests your application
      * to save its state.
      *
-     * You @em must @em not change the group of the @p kconfig object, since
+     * You @em must @em not change the group of the @p tdeconfig object, since
      * KMainWindow uses one group for each window.  Please
      * reimplement these function in childclasses.
      *
diff --git a/tdeui/kmenubar.cpp b/tdeui/kmenubar.cpp
index f6cac81ab..d2b97f3b0 100644
--- a/tdeui/kmenubar.cpp
+++ b/tdeui/kmenubar.cpp
@@ -32,7 +32,7 @@
 #include <tqstyle.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kmenubar.h>
 #include <kapplication.h>
diff --git a/tdeui/kmessagebox.cpp b/tdeui/kmessagebox.cpp
index 524636089..d0c4f0a11 100644
--- a/tdeui/kmessagebox.cpp
+++ b/tdeui/kmessagebox.cpp
@@ -32,7 +32,7 @@
 #include <tqlayout.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kguiitem.h>
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index 7ca2999f1..d38f36980 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kpanelapplet.h"
 #include "kpanelapplet.moc"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KPanelApplet::KPanelAppletPrivate
 {
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index 2ef893927..43c7221aa 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __kpanelapplet_h__
 
 #include <tqframe.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TDEConfig;
 class TQPopupMenu;
diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp
index aae989c2e..31fbd4343 100644
--- a/tdeui/kpanelextension.cpp
+++ b/tdeui/kpanelextension.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqpopupmenu.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kpanelextension.h"
 #include "kpanelextension.moc"
diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp
index 101d2aba0..a995661c3 100644
--- a/tdeui/kpanelmenu.cpp
+++ b/tdeui/kpanelmenu.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 
 #include "kpanelmenu.h"
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 5803ca477..46a8cccde 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -41,7 +41,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kaboutdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp
index fe2414a67..8892ce153 100644
--- a/tdeui/kpassivepopup.cpp
+++ b/tdeui/kpassivepopup.cpp
@@ -6,7 +6,7 @@
  *   email                : sascha.cunz@tiscali.de
  */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqapplication.h>
 #include <tqlabel.h>
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index 004a51349..7ce3a1be2 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -19,7 +19,7 @@
 #include <tqglobal.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <sys/types.h>
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index c61d140dd..35bf0928f 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h> 
 #include <kapplication.h>
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index d74a40706..363a9b8b4 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -26,10 +26,10 @@
 #include <tqtimer.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <klocale.h>
diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp
index fe865d31e..997de84b3 100644
--- a/tdeui/kscrollview.cpp
+++ b/tdeui/kscrollview.cpp
@@ -24,7 +24,7 @@
 
 #include "kscrollview.h"
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 struct KScrollView::KScrollViewPrivate {
diff --git a/tdeui/kshortcutdialog.cpp b/tdeui/kshortcutdialog.cpp
index c93194e77..db5e32322 100644
--- a/tdeui/kshortcutdialog.cpp
+++ b/tdeui/kshortcutdialog.cpp
@@ -53,7 +53,7 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdeui/ksplashscreen.cpp b/tdeui/ksplashscreen.cpp
index b88be8e06..a45a579bb 100644
--- a/tdeui/ksplashscreen.cpp
+++ b/tdeui/ksplashscreen.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index 7d7856a34..134d7f1a5 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index f86083d0a..57f1dee15 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -27,7 +27,7 @@
 #include <tqmap.h>
 
 #include <klanguagebutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 866bcfce1..07ddf93c4 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdespell.h>
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 717d5c574..3b68d583a 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -36,7 +36,7 @@
 
 #include <kimageeffect.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqapplication.h>
 #include <tqbitmap.h>
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index e447eab26..5eef3dd73 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqstyle.h>
 #include <tqstylesheet.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 
diff --git a/tdeui/ktimezonewidget.cpp b/tdeui/ktimezonewidget.cpp
index a9a73a4f5..5db720a68 100644
--- a/tdeui/ktimezonewidget.cpp
+++ b/tdeui/ktimezonewidget.cpp
@@ -19,7 +19,7 @@
 
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 085aba857..7be804565 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index 41d416f01..8c64dfdc6 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -51,7 +51,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
 #include <kpopupmenu.h>
diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp
index 0b1b4f5fb..85a23341e 100644
--- a/tdeui/tdecmodule.cpp
+++ b/tdeui/tdecmodule.cpp
@@ -24,8 +24,8 @@
 #include <tqlayout.h>
 
 #include <kaboutdata.h>
-#include <kconfigskeleton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigskeleton.h>
+#include <tdeconfigdialogmanager.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinstance.h>
diff --git a/tdeui/tdecmodule.h b/tdeui/tdecmodule.h
index 41d8d095e..12a10fac9 100644
--- a/tdeui/tdecmodule.h
+++ b/tdeui/tdecmodule.h
@@ -300,9 +300,9 @@ protected:
    * Help: shows a "Help" button.
    * Default: shows a "Use Defaults" button
    * Apply: in kcontrol this will show an "Apply" and "Reset" button
-   *        in kcmshell this will show an "Ok", "Apply" and "Cancel" button
+   *        in tdecmshell this will show an "Ok", "Apply" and "Cancel" button
    *
-   * If Apply is not specified, kcmshell will show a "Close" button.
+   * If Apply is not specified, tdecmshell will show a "Close" button.
    *
    * @see TDECModule::buttons
    */
diff --git a/tdeui/kconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp
index 9707bc26a..c8e848fa3 100644
--- a/tdeui/kconfigdialog.cpp
+++ b/tdeui/tdeconfigdialog.cpp
@@ -19,10 +19,10 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
-#include "kconfigdialog.h"
+#include "tdeconfigdialog.h"
 
-#include <kconfigskeleton.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigskeleton.h>
+#include <tdeconfigdialogmanager.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
@@ -256,4 +256,4 @@ void TDEConfigDialog::updateWidgetsDefault()
 }
 
 
-#include "kconfigdialog.moc"
+#include "tdeconfigdialog.moc"
diff --git a/tdeui/kconfigdialog.h b/tdeui/tdeconfigdialog.h
index f7cc10e26..f7cc10e26 100644
--- a/tdeui/kconfigdialog.h
+++ b/tdeui/tdeconfigdialog.h
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index 9e92fb47e..bb0c0338b 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -18,7 +18,7 @@
 
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconview.h>
 #include <klistview.h>
 #include <klistbox.h>
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index a6dadcfd3..1a506cbc0 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -19,7 +19,7 @@
 
 #include <kapplication.h>
 #include "kcolordialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 int main( int argc, char *argv[] )
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index 8b2ecb829..c252c7cf8 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -19,7 +19,7 @@
 #include <tqstrlist.h>
 #include <tqpainter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 //#include <kimgio.h>
 #include <stdlib.h>
diff --git a/tdeui/tests/kfontdialogtest.cpp b/tdeui/tests/kfontdialogtest.cpp
index 14edee074..0b3d4eb30 100644
--- a/tdeui/tests/kfontdialogtest.cpp
+++ b/tdeui/tests/kfontdialogtest.cpp
@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include "kfontdialog.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
  int main( int argc, char **argv )